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

Rename _ol_source_Vector_ to VectorSource

Browse Source
This commit is contained in:
Tim Schaub
2018-01-08 10:06:23 -07:00
parent 45c6e43b42
commit ca6ea355e6
94 changed files with 279 additions and 279 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
examples/blend-modes.js
View File

@@ -3,7 +3,7 @@ import Map from '../src/ol/Map.js';
import View from '../src/ol/View.js'; import View from '../src/ol/View.js';
import Point from '../src/ol/geom/Point.js'; import Point from '../src/ol/geom/Point.js';
import VectorLayer from '../src/ol/layer/Vector.js'; import VectorLayer from '../src/ol/layer/Vector.js';
import _ol_source_Vector_ from '../src/ol/source/Vector.js'; import VectorSource from '../src/ol/source/Vector.js';
import _ol_style_Circle_ from '../src/ol/style/Circle.js'; import _ol_style_Circle_ from '../src/ol/style/Circle.js';
import _ol_style_Fill_ from '../src/ol/style/Fill.js'; import _ol_style_Fill_ from '../src/ol/style/Fill.js';
import _ol_style_Stroke_ from '../src/ol/style/Stroke.js'; import _ol_style_Stroke_ from '../src/ol/style/Stroke.js';
@@ -15,7 +15,7 @@ import _ol_style_Style_ from '../src/ol/style/Style.js';
// Every layer has one feature that is styled with a circle, together the // Every layer has one feature that is styled with a circle, together the
// features form the corners of an equilateral triangle and their styles overlap // features form the corners of an equilateral triangle and their styles overlap
var redLayer = new VectorLayer({ var redLayer = new VectorLayer({
source: new _ol_source_Vector_({ source: new VectorSource({
features: [new Feature(new Point([0, 0]))] features: [new Feature(new Point([0, 0]))]
}), }),
style: new _ol_style_Style_({ style: new _ol_style_Style_({
@@ -32,7 +32,7 @@ var redLayer = new VectorLayer({
}) })
}); });
var greenLayer = new VectorLayer({ var greenLayer = new VectorLayer({
source: new _ol_source_Vector_({ source: new VectorSource({
// 433.013 is roughly 250 * Math.sqrt(3) // 433.013 is roughly 250 * Math.sqrt(3)
features: [new Feature(new Point([250, 433.013]))] features: [new Feature(new Point([250, 433.013]))]
}), }),
@@ -50,7 +50,7 @@ var greenLayer = new VectorLayer({
}) })
}); });
var blueLayer = new VectorLayer({ var blueLayer = new VectorLayer({
source: new _ol_source_Vector_({ source: new VectorSource({
features: [new Feature(new Point([500, 0]))] features: [new Feature(new Point([500, 0]))]
}), }),
style: new _ol_style_Style_({ style: new _ol_style_Style_({

4
examples/box-selection.js
View File

@@ -7,10 +7,10 @@ import _ol_interaction_Select_ from '../src/ol/interaction/Select.js';
import TileLayer from '../src/ol/layer/Tile.js'; import TileLayer from '../src/ol/layer/Tile.js';
import VectorLayer from '../src/ol/layer/Vector.js'; import VectorLayer from '../src/ol/layer/Vector.js';
import _ol_source_OSM_ from '../src/ol/source/OSM.js'; import _ol_source_OSM_ from '../src/ol/source/OSM.js';
import _ol_source_Vector_ from '../src/ol/source/Vector.js'; import VectorSource from '../src/ol/source/Vector.js';
var vectorSource = new _ol_source_Vector_({ var vectorSource = new VectorSource({
url: 'data/geojson/countries.geojson', url: 'data/geojson/countries.geojson',
format: new GeoJSON() format: new GeoJSON()
}); });

4
examples/canvas-gradient-pattern.js
View File

@@ -5,7 +5,7 @@ import GeoJSON from '../src/ol/format/GeoJSON.js';
import _ol_has_ from '../src/ol/has.js'; import _ol_has_ from '../src/ol/has.js';
import VectorLayer from '../src/ol/layer/Vector.js'; import VectorLayer from '../src/ol/layer/Vector.js';
import {fromLonLat} from '../src/ol/proj.js'; import {fromLonLat} from '../src/ol/proj.js';
import _ol_source_Vector_ from '../src/ol/source/Vector.js'; import VectorSource from '../src/ol/source/Vector.js';
import _ol_style_Fill_ from '../src/ol/style/Fill.js'; import _ol_style_Fill_ from '../src/ol/style/Fill.js';
import _ol_style_Stroke_ from '../src/ol/style/Stroke.js'; import _ol_style_Stroke_ from '../src/ol/style/Stroke.js';
import _ol_style_Style_ from '../src/ol/style/Style.js'; import _ol_style_Style_ from '../src/ol/style/Style.js';
@@ -82,7 +82,7 @@ var getStackedStyle = function(feature, resolution) {
// Create a vector layer that makes use of the style function above… // Create a vector layer that makes use of the style function above…
var vectorLayer = new VectorLayer({ var vectorLayer = new VectorLayer({
source: new _ol_source_Vector_({ source: new VectorSource({
url: 'data/geojson/countries.geojson', url: 'data/geojson/countries.geojson',
format: new GeoJSON() format: new GeoJSON()
}), }),

4
examples/center.js
View File

@@ -5,13 +5,13 @@ import GeoJSON from '../src/ol/format/GeoJSON.js';
import TileLayer from '../src/ol/layer/Tile.js'; import TileLayer from '../src/ol/layer/Tile.js';
import VectorLayer from '../src/ol/layer/Vector.js'; import VectorLayer from '../src/ol/layer/Vector.js';
import _ol_source_OSM_ from '../src/ol/source/OSM.js'; import _ol_source_OSM_ from '../src/ol/source/OSM.js';
import _ol_source_Vector_ from '../src/ol/source/Vector.js'; import VectorSource from '../src/ol/source/Vector.js';
import _ol_style_Circle_ from '../src/ol/style/Circle.js'; import _ol_style_Circle_ from '../src/ol/style/Circle.js';
import _ol_style_Fill_ from '../src/ol/style/Fill.js'; import _ol_style_Fill_ from '../src/ol/style/Fill.js';
import _ol_style_Stroke_ from '../src/ol/style/Stroke.js'; import _ol_style_Stroke_ from '../src/ol/style/Stroke.js';
import _ol_style_Style_ from '../src/ol/style/Style.js'; import _ol_style_Style_ from '../src/ol/style/Style.js';
var source = new _ol_source_Vector_({ var source = new VectorSource({
url: 'data/geojson/switzerland.geojson', url: 'data/geojson/switzerland.geojson',
format: new GeoJSON() format: new GeoJSON()
}); });

4
examples/cluster.js
View File

@@ -6,7 +6,7 @@ import TileLayer from '../src/ol/layer/Tile.js';
import VectorLayer from '../src/ol/layer/Vector.js'; import VectorLayer from '../src/ol/layer/Vector.js';
import _ol_source_Cluster_ from '../src/ol/source/Cluster.js'; import _ol_source_Cluster_ from '../src/ol/source/Cluster.js';
import _ol_source_OSM_ from '../src/ol/source/OSM.js'; import _ol_source_OSM_ from '../src/ol/source/OSM.js';
import _ol_source_Vector_ from '../src/ol/source/Vector.js'; import VectorSource from '../src/ol/source/Vector.js';
import _ol_style_Circle_ from '../src/ol/style/Circle.js'; import _ol_style_Circle_ from '../src/ol/style/Circle.js';
import _ol_style_Fill_ from '../src/ol/style/Fill.js'; import _ol_style_Fill_ from '../src/ol/style/Fill.js';
import _ol_style_Stroke_ from '../src/ol/style/Stroke.js'; import _ol_style_Stroke_ from '../src/ol/style/Stroke.js';
@@ -24,7 +24,7 @@ for (var i = 0; i < count; ++i) {
features[i] = new Feature(new Point(coordinates)); features[i] = new Feature(new Point(coordinates));
} }
var source = new _ol_source_Vector_({ var source = new VectorSource({
features: features features: features
}); });

4
examples/custom-interactions.js
View File

@@ -10,7 +10,7 @@ import _ol_interaction_Pointer_ from '../src/ol/interaction/Pointer.js';
import TileLayer from '../src/ol/layer/Tile.js'; import TileLayer from '../src/ol/layer/Tile.js';
import VectorLayer from '../src/ol/layer/Vector.js'; import VectorLayer from '../src/ol/layer/Vector.js';
import _ol_source_TileJSON_ from '../src/ol/source/TileJSON.js'; import _ol_source_TileJSON_ from '../src/ol/source/TileJSON.js';
import _ol_source_Vector_ from '../src/ol/source/Vector.js'; import VectorSource from '../src/ol/source/Vector.js';
import _ol_style_Fill_ from '../src/ol/style/Fill.js'; import _ol_style_Fill_ from '../src/ol/style/Fill.js';
import _ol_style_Icon_ from '../src/ol/style/Icon.js'; import _ol_style_Icon_ from '../src/ol/style/Icon.js';
import _ol_style_Stroke_ from '../src/ol/style/Stroke.js'; import _ol_style_Stroke_ from '../src/ol/style/Stroke.js';
@@ -153,7 +153,7 @@ var map = new Map({
}) })
}), }),
new VectorLayer({ new VectorLayer({
source: new _ol_source_Vector_({ source: new VectorSource({
features: [pointFeature, lineFeature, polygonFeature] features: [pointFeature, lineFeature, polygonFeature]
}), }),
style: new _ol_style_Style_({ style: new _ol_style_Style_({

4
examples/drag-and-drop-image-vector.js
View File

@@ -10,7 +10,7 @@ import DragAndDrop from '../src/ol/interaction/DragAndDrop.js';
import VectorLayer from '../src/ol/layer/Vector.js'; import VectorLayer from '../src/ol/layer/Vector.js';
import TileLayer from '../src/ol/layer/Tile.js'; import TileLayer from '../src/ol/layer/Tile.js';
import _ol_source_BingMaps_ from '../src/ol/source/BingMaps.js'; import _ol_source_BingMaps_ from '../src/ol/source/BingMaps.js';
import _ol_source_Vector_ from '../src/ol/source/Vector.js'; import VectorSource from '../src/ol/source/Vector.js';
import _ol_style_Circle_ from '../src/ol/style/Circle.js'; import _ol_style_Circle_ from '../src/ol/style/Circle.js';
import _ol_style_Fill_ from '../src/ol/style/Fill.js'; import _ol_style_Fill_ from '../src/ol/style/Fill.js';
import _ol_style_Stroke_ from '../src/ol/style/Stroke.js'; import _ol_style_Stroke_ from '../src/ol/style/Stroke.js';
@@ -111,7 +111,7 @@ var map = new Map({
}); });
dragAndDropInteraction.on('addfeatures', function(event) { dragAndDropInteraction.on('addfeatures', function(event) {
var vectorSource = new _ol_source_Vector_({ var vectorSource = new VectorSource({
features: event.features features: event.features
}); });
map.addLayer(new VectorLayer({ map.addLayer(new VectorLayer({

4
examples/drag-and-drop.js
View File

@@ -10,7 +10,7 @@ import DragAndDrop from '../src/ol/interaction/DragAndDrop.js';
import TileLayer from '../src/ol/layer/Tile.js'; import TileLayer from '../src/ol/layer/Tile.js';
import VectorLayer from '../src/ol/layer/Vector.js'; import VectorLayer from '../src/ol/layer/Vector.js';
import _ol_source_BingMaps_ from '../src/ol/source/BingMaps.js'; import _ol_source_BingMaps_ from '../src/ol/source/BingMaps.js';
import _ol_source_Vector_ from '../src/ol/source/Vector.js'; import VectorSource from '../src/ol/source/Vector.js';
import _ol_style_Circle_ from '../src/ol/style/Circle.js'; import _ol_style_Circle_ from '../src/ol/style/Circle.js';
import _ol_style_Fill_ from '../src/ol/style/Fill.js'; import _ol_style_Fill_ from '../src/ol/style/Fill.js';
import _ol_style_Stroke_ from '../src/ol/style/Stroke.js'; import _ol_style_Stroke_ from '../src/ol/style/Stroke.js';
@@ -111,7 +111,7 @@ var map = new Map({
}); });
dragAndDropInteraction.on('addfeatures', function(event) { dragAndDropInteraction.on('addfeatures', function(event) {
var vectorSource = new _ol_source_Vector_({ var vectorSource = new VectorSource({
features: event.features features: event.features
}); });
map.addLayer(new VectorLayer({ map.addLayer(new VectorLayer({

4
examples/draw-and-modify-features.js
View File

@@ -6,7 +6,7 @@ import _ol_interaction_Snap_ from '../src/ol/interaction/Snap.js';
import TileLayer from '../src/ol/layer/Tile.js'; import TileLayer from '../src/ol/layer/Tile.js';
import VectorLayer from '../src/ol/layer/Vector.js'; import VectorLayer from '../src/ol/layer/Vector.js';
import _ol_source_OSM_ from '../src/ol/source/OSM.js'; import _ol_source_OSM_ from '../src/ol/source/OSM.js';
import _ol_source_Vector_ from '../src/ol/source/Vector.js'; import VectorSource from '../src/ol/source/Vector.js';
import _ol_style_Circle_ from '../src/ol/style/Circle.js'; import _ol_style_Circle_ from '../src/ol/style/Circle.js';
import _ol_style_Fill_ from '../src/ol/style/Fill.js'; import _ol_style_Fill_ from '../src/ol/style/Fill.js';
import _ol_style_Stroke_ from '../src/ol/style/Stroke.js'; import _ol_style_Stroke_ from '../src/ol/style/Stroke.js';
@@ -16,7 +16,7 @@ var raster = new TileLayer({
source: new _ol_source_OSM_() source: new _ol_source_OSM_()
}); });
var source = new _ol_source_Vector_(); var source = new VectorSource();
var vector = new VectorLayer({ var vector = new VectorLayer({
source: source, source: source,
style: new _ol_style_Style_({ style: new _ol_style_Style_({

4
examples/draw-features.js
View File

@@ -4,13 +4,13 @@ import Draw from '../src/ol/interaction/Draw.js';
import TileLayer from '../src/ol/layer/Tile.js'; import TileLayer from '../src/ol/layer/Tile.js';
import VectorLayer from '../src/ol/layer/Vector.js'; import VectorLayer from '../src/ol/layer/Vector.js';
import _ol_source_OSM_ from '../src/ol/source/OSM.js'; import _ol_source_OSM_ from '../src/ol/source/OSM.js';
import _ol_source_Vector_ from '../src/ol/source/Vector.js'; import VectorSource from '../src/ol/source/Vector.js';
var raster = new TileLayer({ var raster = new TileLayer({
source: new _ol_source_OSM_() source: new _ol_source_OSM_()
}); });
var source = new _ol_source_Vector_({wrapX: false}); var source = new VectorSource({wrapX: false});
var vector = new VectorLayer({ var vector = new VectorLayer({
source: source source: source

4
examples/draw-freehand.js
View File

@@ -4,13 +4,13 @@ import Draw from '../src/ol/interaction/Draw.js';
import TileLayer from '../src/ol/layer/Tile.js'; import TileLayer from '../src/ol/layer/Tile.js';
import VectorLayer from '../src/ol/layer/Vector.js'; import VectorLayer from '../src/ol/layer/Vector.js';
import _ol_source_OSM_ from '../src/ol/source/OSM.js'; import _ol_source_OSM_ from '../src/ol/source/OSM.js';
import _ol_source_Vector_ from '../src/ol/source/Vector.js'; import VectorSource from '../src/ol/source/Vector.js';
var raster = new TileLayer({ var raster = new TileLayer({
source: new _ol_source_OSM_() source: new _ol_source_OSM_()
}); });
var source = new _ol_source_Vector_({wrapX: false}); var source = new VectorSource({wrapX: false});
var vector = new VectorLayer({ var vector = new VectorLayer({
source: source source: source

4
examples/draw-shapes.js
View File

@@ -5,13 +5,13 @@ import Draw from '../src/ol/interaction/Draw.js';
import TileLayer from '../src/ol/layer/Tile.js'; import TileLayer from '../src/ol/layer/Tile.js';
import VectorLayer from '../src/ol/layer/Vector.js'; import VectorLayer from '../src/ol/layer/Vector.js';
import _ol_source_OSM_ from '../src/ol/source/OSM.js'; import _ol_source_OSM_ from '../src/ol/source/OSM.js';
import _ol_source_Vector_ from '../src/ol/source/Vector.js'; import VectorSource from '../src/ol/source/Vector.js';
var raster = new TileLayer({ var raster = new TileLayer({
source: new _ol_source_OSM_() source: new _ol_source_OSM_()
}); });
var source = new _ol_source_Vector_({wrapX: false}); var source = new VectorSource({wrapX: false});
var vector = new VectorLayer({ var vector = new VectorLayer({
source: source source: source

4
examples/earthquake-clusters.js
View File

@@ -8,7 +8,7 @@ import TileLayer from '../src/ol/layer/Tile.js';
import VectorLayer from '../src/ol/layer/Vector.js'; import VectorLayer from '../src/ol/layer/Vector.js';
import _ol_source_Cluster_ from '../src/ol/source/Cluster.js'; import _ol_source_Cluster_ from '../src/ol/source/Cluster.js';
import _ol_source_Stamen_ from '../src/ol/source/Stamen.js'; import _ol_source_Stamen_ from '../src/ol/source/Stamen.js';
import _ol_source_Vector_ from '../src/ol/source/Vector.js'; import VectorSource from '../src/ol/source/Vector.js';
import _ol_style_Circle_ from '../src/ol/style/Circle.js'; import _ol_style_Circle_ from '../src/ol/style/Circle.js';
import _ol_style_Fill_ from '../src/ol/style/Fill.js'; import _ol_style_Fill_ from '../src/ol/style/Fill.js';
import _ol_style_RegularShape_ from '../src/ol/style/RegularShape.js'; import _ol_style_RegularShape_ from '../src/ol/style/RegularShape.js';
@@ -124,7 +124,7 @@ function selectStyleFunction(feature) {
vector = new VectorLayer({ vector = new VectorLayer({
source: new _ol_source_Cluster_({ source: new _ol_source_Cluster_({
distance: 40, distance: 40,
source: new _ol_source_Vector_({ source: new VectorSource({
url: 'data/kml/2012_Earthquakes_Mag5.kml', url: 'data/kml/2012_Earthquakes_Mag5.kml',
format: new KML({ format: new KML({
extractStyles: false extractStyles: false

4
examples/earthquake-custom-symbol.js
View File

@@ -6,7 +6,7 @@ import TileLayer from '../src/ol/layer/Tile.js';
import VectorLayer from '../src/ol/layer/Vector.js'; import VectorLayer from '../src/ol/layer/Vector.js';
import _ol_render_ from '../src/ol/render.js'; import _ol_render_ from '../src/ol/render.js';
import _ol_source_Stamen_ from '../src/ol/source/Stamen.js'; import _ol_source_Stamen_ from '../src/ol/source/Stamen.js';
import _ol_source_Vector_ from '../src/ol/source/Vector.js'; import VectorSource from '../src/ol/source/Vector.js';
import _ol_style_Fill_ from '../src/ol/style/Fill.js'; import _ol_style_Fill_ from '../src/ol/style/Fill.js';
import _ol_style_Icon_ from '../src/ol/style/Icon.js'; import _ol_style_Icon_ from '../src/ol/style/Icon.js';
import _ol_style_Stroke_ from '../src/ol/style/Stroke.js'; import _ol_style_Stroke_ from '../src/ol/style/Stroke.js';
@@ -53,7 +53,7 @@ var styleFunction = function(feature) {
}; };
var vector = new VectorLayer({ var vector = new VectorLayer({
source: new _ol_source_Vector_({ source: new VectorSource({
url: 'data/kml/2012_Earthquakes_Mag5.kml', url: 'data/kml/2012_Earthquakes_Mag5.kml',
format: new KML({ format: new KML({
extractStyles: false extractStyles: false

4
examples/export-map.js
View File

@@ -7,7 +7,7 @@ import GeoJSON from '../src/ol/format/GeoJSON.js';
import TileLayer from '../src/ol/layer/Tile.js'; import TileLayer from '../src/ol/layer/Tile.js';
import VectorLayer from '../src/ol/layer/Vector.js'; import VectorLayer from '../src/ol/layer/Vector.js';
import _ol_source_OSM_ from '../src/ol/source/OSM.js'; import _ol_source_OSM_ from '../src/ol/source/OSM.js';
import _ol_source_Vector_ from '../src/ol/source/Vector.js'; import VectorSource from '../src/ol/source/Vector.js';
var map = new Map({ var map = new Map({
layers: [ layers: [
@@ -15,7 +15,7 @@ var map = new Map({
source: new _ol_source_OSM_() source: new _ol_source_OSM_()
}), }),
new VectorLayer({ new VectorLayer({
source: new _ol_source_Vector_({ source: new VectorSource({
url: 'data/geojson/countries.geojson', url: 'data/geojson/countries.geojson',
format: new GeoJSON() format: new GeoJSON()
}) })

4
examples/export-pdf.js
View File

@@ -6,7 +6,7 @@ import WKT from '../src/ol/format/WKT.js';
import TileLayer from '../src/ol/layer/Tile.js'; import TileLayer from '../src/ol/layer/Tile.js';
import VectorLayer from '../src/ol/layer/Vector.js'; import VectorLayer from '../src/ol/layer/Vector.js';
import _ol_source_OSM_ from '../src/ol/source/OSM.js'; import _ol_source_OSM_ from '../src/ol/source/OSM.js';
import _ol_source_Vector_ from '../src/ol/source/Vector.js'; import VectorSource from '../src/ol/source/Vector.js';
var raster = new TileLayer({ var raster = new TileLayer({
source: new _ol_source_OSM_() source: new _ol_source_OSM_()
@@ -20,7 +20,7 @@ var feature = format.readFeature(
feature.getGeometry().transform('EPSG:4326', 'EPSG:3857'); feature.getGeometry().transform('EPSG:4326', 'EPSG:3857');
var vector = new VectorLayer({ var vector = new VectorLayer({
source: new _ol_source_Vector_({ source: new VectorSource({
features: [feature] features: [feature]
}) })
}); });

4
examples/extent-interaction.js
View File

@@ -6,9 +6,9 @@ import _ol_interaction_Extent_ from '../src/ol/interaction/Extent.js';
import TileLayer from '../src/ol/layer/Tile.js'; import TileLayer from '../src/ol/layer/Tile.js';
import VectorLayer from '../src/ol/layer/Vector.js'; import VectorLayer from '../src/ol/layer/Vector.js';
import _ol_source_OSM_ from '../src/ol/source/OSM.js'; import _ol_source_OSM_ from '../src/ol/source/OSM.js';
import _ol_source_Vector_ from '../src/ol/source/Vector.js'; import VectorSource from '../src/ol/source/Vector.js';
var vectorSource = new _ol_source_Vector_({ var vectorSource = new VectorSource({
url: 'data/geojson/countries.geojson', url: 'data/geojson/countries.geojson',
format: new GeoJSON() format: new GeoJSON()
}); });

4
examples/feature-animation.js
View File

@@ -9,7 +9,7 @@ import TileLayer from '../src/ol/layer/Tile.js';
import VectorLayer from '../src/ol/layer/Vector.js'; import VectorLayer from '../src/ol/layer/Vector.js';
import {fromLonLat} from '../src/ol/proj.js'; import {fromLonLat} from '../src/ol/proj.js';
import _ol_source_OSM_ from '../src/ol/source/OSM.js'; import _ol_source_OSM_ from '../src/ol/source/OSM.js';
import _ol_source_Vector_ from '../src/ol/source/Vector.js'; import VectorSource from '../src/ol/source/Vector.js';
import _ol_style_Circle_ from '../src/ol/style/Circle.js'; import _ol_style_Circle_ from '../src/ol/style/Circle.js';
import _ol_style_Stroke_ from '../src/ol/style/Stroke.js'; import _ol_style_Stroke_ from '../src/ol/style/Stroke.js';
import _ol_style_Style_ from '../src/ol/style/Style.js'; import _ol_style_Style_ from '../src/ol/style/Style.js';
@@ -35,7 +35,7 @@ var map = new Map({
}) })
}); });
var source = new _ol_source_Vector_({ var source = new VectorSource({
wrapX: false wrapX: false
}); });
var vector = new VectorLayer({ var vector = new VectorLayer({

4
examples/feature-move-animation.js
View File

@@ -6,7 +6,7 @@ import Point from '../src/ol/geom/Point.js';
import TileLayer from '../src/ol/layer/Tile.js'; import TileLayer from '../src/ol/layer/Tile.js';
import VectorLayer from '../src/ol/layer/Vector.js'; import VectorLayer from '../src/ol/layer/Vector.js';
import _ol_source_BingMaps_ from '../src/ol/source/BingMaps.js'; import _ol_source_BingMaps_ from '../src/ol/source/BingMaps.js';
import _ol_source_Vector_ from '../src/ol/source/Vector.js'; import VectorSource from '../src/ol/source/Vector.js';
import _ol_style_Circle_ from '../src/ol/style/Circle.js'; import _ol_style_Circle_ from '../src/ol/style/Circle.js';
import _ol_style_Fill_ from '../src/ol/style/Fill.js'; import _ol_style_Fill_ from '../src/ol/style/Fill.js';
import _ol_style_Icon_ from '../src/ol/style/Icon.js'; import _ol_style_Icon_ from '../src/ol/style/Icon.js';
@@ -114,7 +114,7 @@ var speedInput = document.getElementById('speed');
var startButton = document.getElementById('start-animation'); var startButton = document.getElementById('start-animation');
var vectorLayer = new VectorLayer({ var vectorLayer = new VectorLayer({
source: new _ol_source_Vector_({ source: new VectorSource({
features: [routeFeature, geoMarker, startMarker, endMarker] features: [routeFeature, geoMarker, startMarker, endMarker]
}), }),
style: function(feature) { style: function(feature) {

4
examples/flight-animation.js
View File

@@ -6,7 +6,7 @@ import LineString from '../src/ol/geom/LineString.js';
import TileLayer from '../src/ol/layer/Tile.js'; import TileLayer from '../src/ol/layer/Tile.js';
import VectorLayer from '../src/ol/layer/Vector.js'; import VectorLayer from '../src/ol/layer/Vector.js';
import _ol_source_Stamen_ from '../src/ol/source/Stamen.js'; import _ol_source_Stamen_ from '../src/ol/source/Stamen.js';
import _ol_source_Vector_ from '../src/ol/source/Vector.js'; import VectorSource from '../src/ol/source/Vector.js';
import _ol_style_Stroke_ from '../src/ol/style/Stroke.js'; import _ol_style_Stroke_ from '../src/ol/style/Stroke.js';
import _ol_style_Style_ from '../src/ol/style/Style.js'; import _ol_style_Style_ from '../src/ol/style/Style.js';
@@ -70,7 +70,7 @@ var animateFlights = function(event) {
map.render(); map.render();
}; };
flightsSource = new _ol_source_Vector_({ flightsSource = new VectorSource({
wrapX: false, wrapX: false,
attributions: 'Flight data by ' + attributions: 'Flight data by ' +
'<a href="http://openflights.org/data.html">OpenFlights</a>,', '<a href="http://openflights.org/data.html">OpenFlights</a>,',

4
examples/fractal.js
View File

@@ -3,7 +3,7 @@ import Map from '../src/ol/Map.js';
import View from '../src/ol/View.js'; import View from '../src/ol/View.js';
import LineString from '../src/ol/geom/LineString.js'; import LineString from '../src/ol/geom/LineString.js';
import VectorLayer from '../src/ol/layer/Vector.js'; import VectorLayer from '../src/ol/layer/Vector.js';
import _ol_source_Vector_ from '../src/ol/source/Vector.js'; import VectorSource from '../src/ol/source/Vector.js';
var radius = 10e6; var radius = 10e6;
var cos30 = Math.cos(Math.PI / 6); var cos30 = Math.cos(Math.PI / 6);
@@ -18,7 +18,7 @@ var triangle = new LineString([
var feature = new Feature(triangle); var feature = new Feature(triangle);
var layer = new VectorLayer({ var layer = new VectorLayer({
source: new _ol_source_Vector_({ source: new VectorSource({
features: [feature] features: [feature]
}) })
}); });

4
examples/geojson.js
View File

@@ -7,7 +7,7 @@ import Circle from '../src/ol/geom/Circle.js';
import TileLayer from '../src/ol/layer/Tile.js'; import TileLayer from '../src/ol/layer/Tile.js';
import VectorLayer from '../src/ol/layer/Vector.js'; import VectorLayer from '../src/ol/layer/Vector.js';
import _ol_source_OSM_ from '../src/ol/source/OSM.js'; import _ol_source_OSM_ from '../src/ol/source/OSM.js';
import _ol_source_Vector_ from '../src/ol/source/Vector.js'; import VectorSource from '../src/ol/source/Vector.js';
import _ol_style_Circle_ from '../src/ol/style/Circle.js'; import _ol_style_Circle_ from '../src/ol/style/Circle.js';
import _ol_style_Fill_ from '../src/ol/style/Fill.js'; import _ol_style_Fill_ from '../src/ol/style/Fill.js';
import _ol_style_Stroke_ from '../src/ol/style/Stroke.js'; import _ol_style_Stroke_ from '../src/ol/style/Stroke.js';
@@ -160,7 +160,7 @@ var geojsonObject = {
}] }]
}; };
var vectorSource = new _ol_source_Vector_({ var vectorSource = new VectorSource({
features: (new GeoJSON()).readFeatures(geojsonObject) features: (new GeoJSON()).readFeatures(geojsonObject)
}); });

4
examples/geolocation.js
View File

@@ -7,7 +7,7 @@ import Point from '../src/ol/geom/Point.js';
import TileLayer from '../src/ol/layer/Tile.js'; import TileLayer from '../src/ol/layer/Tile.js';
import VectorLayer from '../src/ol/layer/Vector.js'; import VectorLayer from '../src/ol/layer/Vector.js';
import _ol_source_OSM_ from '../src/ol/source/OSM.js'; import _ol_source_OSM_ from '../src/ol/source/OSM.js';
import _ol_source_Vector_ from '../src/ol/source/Vector.js'; import VectorSource from '../src/ol/source/Vector.js';
import _ol_style_Circle_ from '../src/ol/style/Circle.js'; import _ol_style_Circle_ from '../src/ol/style/Circle.js';
import _ol_style_Fill_ from '../src/ol/style/Fill.js'; import _ol_style_Fill_ from '../src/ol/style/Fill.js';
import _ol_style_Stroke_ from '../src/ol/style/Stroke.js'; import _ol_style_Stroke_ from '../src/ol/style/Stroke.js';
@@ -88,7 +88,7 @@ geolocation.on('change:position', function() {
new VectorLayer({ new VectorLayer({
map: map, map: map,
source: new _ol_source_Vector_({ source: new VectorSource({
features: [accuracyFeature, positionFeature] features: [accuracyFeature, positionFeature]
}) })
}); });

4
examples/gpx.js
View File

@@ -4,7 +4,7 @@ import GPX from '../src/ol/format/GPX.js';
import TileLayer from '../src/ol/layer/Tile.js'; import TileLayer from '../src/ol/layer/Tile.js';
import VectorLayer from '../src/ol/layer/Vector.js'; import VectorLayer from '../src/ol/layer/Vector.js';
import _ol_source_BingMaps_ from '../src/ol/source/BingMaps.js'; import _ol_source_BingMaps_ from '../src/ol/source/BingMaps.js';
import _ol_source_Vector_ from '../src/ol/source/Vector.js'; import VectorSource from '../src/ol/source/Vector.js';
import _ol_style_Circle_ from '../src/ol/style/Circle.js'; import _ol_style_Circle_ from '../src/ol/style/Circle.js';
import _ol_style_Fill_ from '../src/ol/style/Fill.js'; import _ol_style_Fill_ from '../src/ol/style/Fill.js';
import _ol_style_Stroke_ from '../src/ol/style/Stroke.js'; import _ol_style_Stroke_ from '../src/ol/style/Stroke.js';
@@ -45,7 +45,7 @@ var style = {
}; };
var vector = new VectorLayer({ var vector = new VectorLayer({
source: new _ol_source_Vector_({ source: new VectorSource({
url: 'data/gpx/fells_loop.gpx', url: 'data/gpx/fells_loop.gpx',
format: new GPX() format: new GPX()
}), }),

4
examples/heatmap-earthquakes.js
View File

@@ -4,13 +4,13 @@ import KML from '../src/ol/format/KML.js';
import HeatmapLayer from '../src/ol/layer/Heatmap.js'; import HeatmapLayer from '../src/ol/layer/Heatmap.js';
import TileLayer from '../src/ol/layer/Tile.js'; import TileLayer from '../src/ol/layer/Tile.js';
import _ol_source_Stamen_ from '../src/ol/source/Stamen.js'; import _ol_source_Stamen_ from '../src/ol/source/Stamen.js';
import _ol_source_Vector_ from '../src/ol/source/Vector.js'; import VectorSource from '../src/ol/source/Vector.js';
var blur = document.getElementById('blur'); var blur = document.getElementById('blur');
var radius = document.getElementById('radius'); var radius = document.getElementById('radius');
var vector = new HeatmapLayer({ var vector = new HeatmapLayer({
source: new _ol_source_Vector_({ source: new VectorSource({
url: 'data/kml/2012_Earthquakes_Mag5.kml', url: 'data/kml/2012_Earthquakes_Mag5.kml',
format: new KML({ format: new KML({
extractStyles: false extractStyles: false

4
examples/hit-tolerance.js
View File

@@ -3,7 +3,7 @@ import View from '../src/ol/View.js';
import TileLayer from '../src/ol/layer/Tile.js'; import TileLayer from '../src/ol/layer/Tile.js';
import VectorLayer from '../src/ol/layer/Vector.js'; import VectorLayer from '../src/ol/layer/Vector.js';
import _ol_source_OSM_ from '../src/ol/source/OSM.js'; import _ol_source_OSM_ from '../src/ol/source/OSM.js';
import _ol_source_Vector_ from '../src/ol/source/Vector.js'; import VectorSource from '../src/ol/source/Vector.js';
import Feature from '../src/ol/Feature.js'; import Feature from '../src/ol/Feature.js';
import LineString from '../src/ol/geom/LineString.js'; import LineString from '../src/ol/geom/LineString.js';
import _ol_style_Style_ from '../src/ol/style/Style.js'; import _ol_style_Style_ from '../src/ol/style/Style.js';
@@ -23,7 +23,7 @@ var style = new _ol_style_Style_({
var feature = new Feature(new LineString([[-4000000, 0], [4000000, 0]])); var feature = new Feature(new LineString([[-4000000, 0], [4000000, 0]]));
var vector = new VectorLayer({ var vector = new VectorLayer({
source: new _ol_source_Vector_({ source: new VectorSource({
features: [feature] features: [feature]
}), }),
style: style style: style

4
examples/icon-color.js
View File

@@ -6,7 +6,7 @@ import TileLayer from '../src/ol/layer/Tile.js';
import VectorLayer from '../src/ol/layer/Vector.js'; import VectorLayer from '../src/ol/layer/Vector.js';
import {fromLonLat} from '../src/ol/proj.js'; import {fromLonLat} from '../src/ol/proj.js';
import _ol_source_TileJSON_ from '../src/ol/source/TileJSON.js'; import _ol_source_TileJSON_ from '../src/ol/source/TileJSON.js';
import _ol_source_Vector_ from '../src/ol/source/Vector.js'; import VectorSource from '../src/ol/source/Vector.js';
import _ol_style_Icon_ from '../src/ol/style/Icon.js'; import _ol_style_Icon_ from '../src/ol/style/Icon.js';
import _ol_style_Style_ from '../src/ol/style/Style.js'; import _ol_style_Style_ from '../src/ol/style/Style.js';
@@ -48,7 +48,7 @@ madrid.setStyle(new _ol_style_Style_({
})); }));
var vectorSource = new _ol_source_Vector_({ var vectorSource = new VectorSource({
features: [rome, london, madrid] features: [rome, london, madrid]
}); });

4
examples/icon-negative.js
View File

@@ -6,7 +6,7 @@ import _ol_interaction_Select_ from '../src/ol/interaction/Select.js';
import TileLayer from '../src/ol/layer/Tile.js'; import TileLayer from '../src/ol/layer/Tile.js';
import VectorLayer from '../src/ol/layer/Vector.js'; import VectorLayer from '../src/ol/layer/Vector.js';
import _ol_source_Stamen_ from '../src/ol/source/Stamen.js'; import _ol_source_Stamen_ from '../src/ol/source/Stamen.js';
import _ol_source_Vector_ from '../src/ol/source/Vector.js'; import VectorSource from '../src/ol/source/Vector.js';
import _ol_style_Icon_ from '../src/ol/style/Icon.js'; import _ol_style_Icon_ from '../src/ol/style/Icon.js';
import _ol_style_Style_ from '../src/ol/style/Style.js'; import _ol_style_Style_ from '../src/ol/style/Style.js';
@@ -35,7 +35,7 @@ var map = new Map({
style: function(feature) { style: function(feature) {
return feature.get('style'); return feature.get('style');
}, },
source: new _ol_source_Vector_({features: [iconFeature]}) source: new VectorSource({features: [iconFeature]})
}) })
], ],
target: document.getElementById('map'), target: document.getElementById('map'),

6
examples/icon-sprite-webgl.js
View File

@@ -3,7 +3,7 @@ import Map from '../src/ol/Map.js';
import View from '../src/ol/View.js'; import View from '../src/ol/View.js';
import Point from '../src/ol/geom/Point.js'; import Point from '../src/ol/geom/Point.js';
import VectorLayer from '../src/ol/layer/Vector.js'; import VectorLayer from '../src/ol/layer/Vector.js';
import _ol_source_Vector_ from '../src/ol/source/Vector.js'; import VectorSource from '../src/ol/source/Vector.js';
import _ol_style_Icon_ from '../src/ol/style/Icon.js'; import _ol_style_Icon_ from '../src/ol/style/Icon.js';
import _ol_style_Style_ from '../src/ol/style/Style.js'; import _ol_style_Style_ from '../src/ol/style/Style.js';
@@ -72,7 +72,7 @@ for (i = 0; i < featureCount; ++i) {
features[i] = feature; features[i] = feature;
} }
var vectorSource = new _ol_source_Vector_({ var vectorSource = new VectorSource({
features: features features: features
}); });
var vector = new VectorLayer({ var vector = new VectorLayer({
@@ -98,7 +98,7 @@ for (i = 0; i < featureCount; i += 30) {
new VectorLayer({ new VectorLayer({
map: map, map: map,
source: new _ol_source_Vector_({ source: new VectorSource({
features: overlayFeatures features: overlayFeatures
}), }),
style: new _ol_style_Style_({ style: new _ol_style_Style_({

4
examples/icon.js
View File

@@ -6,7 +6,7 @@ import Point from '../src/ol/geom/Point.js';
import TileLayer from '../src/ol/layer/Tile.js'; import TileLayer from '../src/ol/layer/Tile.js';
import VectorLayer from '../src/ol/layer/Vector.js'; import VectorLayer from '../src/ol/layer/Vector.js';
import _ol_source_TileJSON_ from '../src/ol/source/TileJSON.js'; import _ol_source_TileJSON_ from '../src/ol/source/TileJSON.js';
import _ol_source_Vector_ from '../src/ol/source/Vector.js'; import VectorSource from '../src/ol/source/Vector.js';
import _ol_style_Icon_ from '../src/ol/style/Icon.js'; import _ol_style_Icon_ from '../src/ol/style/Icon.js';
import _ol_style_Style_ from '../src/ol/style/Style.js'; import _ol_style_Style_ from '../src/ol/style/Style.js';
@@ -29,7 +29,7 @@ var iconStyle = new _ol_style_Style_({
iconFeature.setStyle(iconStyle); iconFeature.setStyle(iconStyle);
var vectorSource = new _ol_source_Vector_({ var vectorSource = new VectorSource({
features: [iconFeature] features: [iconFeature]
}); });

6
examples/igc.js
View File

@@ -8,7 +8,7 @@ import Point from '../src/ol/geom/Point.js';
import TileLayer from '../src/ol/layer/Tile.js'; import TileLayer from '../src/ol/layer/Tile.js';
import VectorLayer from '../src/ol/layer/Vector.js'; import VectorLayer from '../src/ol/layer/Vector.js';
import _ol_source_OSM_ from '../src/ol/source/OSM.js'; import _ol_source_OSM_ from '../src/ol/source/OSM.js';
import _ol_source_Vector_ from '../src/ol/source/Vector.js'; import VectorSource from '../src/ol/source/Vector.js';
import _ol_style_Circle_ from '../src/ol/style/Circle.js'; import _ol_style_Circle_ from '../src/ol/style/Circle.js';
import _ol_style_Fill_ from '../src/ol/style/Fill.js'; import _ol_style_Fill_ from '../src/ol/style/Fill.js';
import _ol_style_Stroke_ from '../src/ol/style/Stroke.js'; import _ol_style_Stroke_ from '../src/ol/style/Stroke.js';
@@ -39,7 +39,7 @@ var styleFunction = function(feature) {
return style; return style;
}; };
var vectorSource = new _ol_source_Vector_(); var vectorSource = new VectorSource();
var igcUrls = [ var igcUrls = [
'data/igc/Clement-Latour.igc', 'data/igc/Clement-Latour.igc',
@@ -176,7 +176,7 @@ map.on('postcompose', function(evt) {
}); });
var featureOverlay = new VectorLayer({ var featureOverlay = new VectorLayer({
source: new _ol_source_Vector_(), source: new VectorSource(),
map: map, map: map,
style: new _ol_style_Style_({ style: new _ol_style_Style_({
image: new _ol_style_Circle_({ image: new _ol_style_Circle_({

6
examples/image-vector-layer.js
View File

@@ -2,7 +2,7 @@ import Map from '../src/ol/Map.js';
import View from '../src/ol/View.js'; import View from '../src/ol/View.js';
import GeoJSON from '../src/ol/format/GeoJSON.js'; import GeoJSON from '../src/ol/format/GeoJSON.js';
import VectorLayer from '../src/ol/layer/Vector.js'; import VectorLayer from '../src/ol/layer/Vector.js';
import _ol_source_Vector_ from '../src/ol/source/Vector.js'; import VectorSource from '../src/ol/source/Vector.js';
import _ol_style_Fill_ from '../src/ol/style/Fill.js'; import _ol_style_Fill_ from '../src/ol/style/Fill.js';
import _ol_style_Stroke_ from '../src/ol/style/Stroke.js'; import _ol_style_Stroke_ from '../src/ol/style/Stroke.js';
import _ol_style_Style_ from '../src/ol/style/Style.js'; import _ol_style_Style_ from '../src/ol/style/Style.js';
@@ -24,7 +24,7 @@ var map = new Map({
layers: [ layers: [
new VectorLayer({ new VectorLayer({
renderMode: 'image', renderMode: 'image',
source: new _ol_source_Vector_({ source: new VectorSource({
url: 'data/geojson/countries.geojson', url: 'data/geojson/countries.geojson',
format: new GeoJSON() format: new GeoJSON()
}), }),
@@ -42,7 +42,7 @@ var map = new Map({
}); });
var featureOverlay = new VectorLayer({ var featureOverlay = new VectorLayer({
source: new _ol_source_Vector_(), source: new VectorSource(),
map: map, map: map,
style: new _ol_style_Style_({ style: new _ol_style_Style_({
stroke: new _ol_style_Stroke_({ stroke: new _ol_style_Stroke_({

4
examples/jsts.js
View File

@@ -7,10 +7,10 @@ import TileLayer from '../src/ol/layer/Tile.js';
import VectorLayer from '../src/ol/layer/Vector.js'; import VectorLayer from '../src/ol/layer/Vector.js';
import {fromLonLat} from '../src/ol/proj.js'; import {fromLonLat} from '../src/ol/proj.js';
import _ol_source_OSM_ from '../src/ol/source/OSM.js'; import _ol_source_OSM_ from '../src/ol/source/OSM.js';
import _ol_source_Vector_ from '../src/ol/source/Vector.js'; import VectorSource from '../src/ol/source/Vector.js';
var source = new _ol_source_Vector_(); var source = new VectorSource();
fetch('data/geojson/roads-seoul.geojson').then(function(response) { fetch('data/geojson/roads-seoul.geojson').then(function(response) {
return response.json(); return response.json();
}).then(function(json) { }).then(function(json) {

4
examples/kml-earthquakes.js
View File

@@ -4,7 +4,7 @@ import KML from '../src/ol/format/KML.js';
import TileLayer from '../src/ol/layer/Tile.js'; import TileLayer from '../src/ol/layer/Tile.js';
import VectorLayer from '../src/ol/layer/Vector.js'; import VectorLayer from '../src/ol/layer/Vector.js';
import _ol_source_Stamen_ from '../src/ol/source/Stamen.js'; import _ol_source_Stamen_ from '../src/ol/source/Stamen.js';
import _ol_source_Vector_ from '../src/ol/source/Vector.js'; import VectorSource from '../src/ol/source/Vector.js';
import _ol_style_Circle_ from '../src/ol/style/Circle.js'; import _ol_style_Circle_ from '../src/ol/style/Circle.js';
import _ol_style_Fill_ from '../src/ol/style/Fill.js'; import _ol_style_Fill_ from '../src/ol/style/Fill.js';
import _ol_style_Stroke_ from '../src/ol/style/Stroke.js'; import _ol_style_Stroke_ from '../src/ol/style/Stroke.js';
@@ -39,7 +39,7 @@ var styleFunction = function(feature) {
}; };
var vector = new VectorLayer({ var vector = new VectorLayer({
source: new _ol_source_Vector_({ source: new VectorSource({
url: 'data/kml/2012_Earthquakes_Mag5.kml', url: 'data/kml/2012_Earthquakes_Mag5.kml',
format: new KML({ format: new KML({
extractStyles: false extractStyles: false

4
examples/kml-timezones.js
View File

@@ -4,7 +4,7 @@ import KML from '../src/ol/format/KML.js';
import TileLayer from '../src/ol/layer/Tile.js'; import TileLayer from '../src/ol/layer/Tile.js';
import VectorLayer from '../src/ol/layer/Vector.js'; import VectorLayer from '../src/ol/layer/Vector.js';
import _ol_source_Stamen_ from '../src/ol/source/Stamen.js'; import _ol_source_Stamen_ from '../src/ol/source/Stamen.js';
import _ol_source_Vector_ from '../src/ol/source/Vector.js'; import VectorSource from '../src/ol/source/Vector.js';
import _ol_style_Fill_ from '../src/ol/style/Fill.js'; import _ol_style_Fill_ from '../src/ol/style/Fill.js';
import _ol_style_Stroke_ from '../src/ol/style/Stroke.js'; import _ol_style_Stroke_ from '../src/ol/style/Stroke.js';
import _ol_style_Style_ from '../src/ol/style/Style.js'; import _ol_style_Style_ from '../src/ol/style/Style.js';
@@ -46,7 +46,7 @@ var styleFunction = function(feature) {
}; };
var vector = new VectorLayer({ var vector = new VectorLayer({
source: new _ol_source_Vector_({ source: new VectorSource({
url: 'data/kml/timezones.kml', url: 'data/kml/timezones.kml',
format: new KML({ format: new KML({
extractStyles: false extractStyles: false

4
examples/kml.js
View File

@@ -4,7 +4,7 @@ import KML from '../src/ol/format/KML.js';
import TileLayer from '../src/ol/layer/Tile.js'; import TileLayer from '../src/ol/layer/Tile.js';
import VectorLayer from '../src/ol/layer/Vector.js'; import VectorLayer from '../src/ol/layer/Vector.js';
import _ol_source_BingMaps_ from '../src/ol/source/BingMaps.js'; import _ol_source_BingMaps_ from '../src/ol/source/BingMaps.js';
import _ol_source_Vector_ from '../src/ol/source/Vector.js'; import VectorSource from '../src/ol/source/Vector.js';
var raster = new TileLayer({ var raster = new TileLayer({
source: new _ol_source_BingMaps_({ source: new _ol_source_BingMaps_({
@@ -14,7 +14,7 @@ var raster = new TileLayer({
}); });
var vector = new VectorLayer({ var vector = new VectorLayer({
source: new _ol_source_Vector_({ source: new VectorSource({
url: 'data/kml/2012-02-10.kml', url: 'data/kml/2012-02-10.kml',
format: new KML() format: new KML()
}) })

4
examples/layer-z-index.js
View File

@@ -3,7 +3,7 @@ import Map from '../src/ol/Map.js';
import View from '../src/ol/View.js'; import View from '../src/ol/View.js';
import Point from '../src/ol/geom/Point.js'; import Point from '../src/ol/geom/Point.js';
import VectorLayer from '../src/ol/layer/Vector.js'; import VectorLayer from '../src/ol/layer/Vector.js';
import _ol_source_Vector_ from '../src/ol/source/Vector.js'; import VectorSource from '../src/ol/source/Vector.js';
import _ol_style_Fill_ from '../src/ol/style/Fill.js'; import _ol_style_Fill_ from '../src/ol/style/Fill.js';
import _ol_style_RegularShape_ from '../src/ol/style/RegularShape.js'; import _ol_style_RegularShape_ from '../src/ol/style/RegularShape.js';
import _ol_style_Stroke_ from '../src/ol/style/Stroke.js'; import _ol_style_Stroke_ from '../src/ol/style/Stroke.js';
@@ -49,7 +49,7 @@ function createLayer(coordinates, style, zIndex) {
var feature = new Feature(new Point(coordinates)); var feature = new Feature(new Point(coordinates));
feature.setStyle(style); feature.setStyle(style);
var source = new _ol_source_Vector_({ var source = new VectorSource({
features: [feature] features: [feature]
}); });

4
examples/line-arrows.js
View File

@@ -5,7 +5,7 @@ import Draw from '../src/ol/interaction/Draw.js';
import TileLayer from '../src/ol/layer/Tile.js'; import TileLayer from '../src/ol/layer/Tile.js';
import VectorLayer from '../src/ol/layer/Vector.js'; import VectorLayer from '../src/ol/layer/Vector.js';
import _ol_source_OSM_ from '../src/ol/source/OSM.js'; import _ol_source_OSM_ from '../src/ol/source/OSM.js';
import _ol_source_Vector_ from '../src/ol/source/Vector.js'; import VectorSource from '../src/ol/source/Vector.js';
import _ol_style_Icon_ from '../src/ol/style/Icon.js'; import _ol_style_Icon_ from '../src/ol/style/Icon.js';
import _ol_style_Stroke_ from '../src/ol/style/Stroke.js'; import _ol_style_Stroke_ from '../src/ol/style/Stroke.js';
import _ol_style_Style_ from '../src/ol/style/Style.js'; import _ol_style_Style_ from '../src/ol/style/Style.js';
@@ -14,7 +14,7 @@ var raster = new TileLayer({
source: new _ol_source_OSM_() source: new _ol_source_OSM_()
}); });
var source = new _ol_source_Vector_(); var source = new VectorSource();
var styleFunction = function(feature) { var styleFunction = function(feature) {
var geometry = feature.getGeometry(); var geometry = feature.getGeometry();

4
examples/measure.js
View File

@@ -9,7 +9,7 @@ import Draw from '../src/ol/interaction/Draw.js';
import TileLayer from '../src/ol/layer/Tile.js'; import TileLayer from '../src/ol/layer/Tile.js';
import VectorLayer from '../src/ol/layer/Vector.js'; import VectorLayer from '../src/ol/layer/Vector.js';
import _ol_source_OSM_ from '../src/ol/source/OSM.js'; import _ol_source_OSM_ from '../src/ol/source/OSM.js';
import _ol_source_Vector_ from '../src/ol/source/Vector.js'; import VectorSource from '../src/ol/source/Vector.js';
import _ol_style_Circle_ from '../src/ol/style/Circle.js'; import _ol_style_Circle_ from '../src/ol/style/Circle.js';
import _ol_style_Fill_ from '../src/ol/style/Fill.js'; import _ol_style_Fill_ from '../src/ol/style/Fill.js';
import _ol_style_Stroke_ from '../src/ol/style/Stroke.js'; import _ol_style_Stroke_ from '../src/ol/style/Stroke.js';
@@ -20,7 +20,7 @@ var raster = new TileLayer({
source: new _ol_source_OSM_() source: new _ol_source_OSM_()
}); });
var source = new _ol_source_Vector_(); var source = new VectorSource();
var vector = new VectorLayer({ var vector = new VectorLayer({
source: source, source: source,

4
examples/modify-features.js
View File

@@ -7,7 +7,7 @@ import _ol_interaction_Select_ from '../src/ol/interaction/Select.js';
import TileLayer from '../src/ol/layer/Tile.js'; import TileLayer from '../src/ol/layer/Tile.js';
import VectorLayer from '../src/ol/layer/Vector.js'; import VectorLayer from '../src/ol/layer/Vector.js';
import _ol_source_OSM_ from '../src/ol/source/OSM.js'; import _ol_source_OSM_ from '../src/ol/source/OSM.js';
import _ol_source_Vector_ from '../src/ol/source/Vector.js'; import VectorSource from '../src/ol/source/Vector.js';
var raster = new TileLayer({ var raster = new TileLayer({
@@ -15,7 +15,7 @@ var raster = new TileLayer({
}); });
var vector = new VectorLayer({ var vector = new VectorLayer({
source: new _ol_source_Vector_({ source: new VectorSource({
url: 'data/geojson/countries.geojson', url: 'data/geojson/countries.geojson',
format: new GeoJSON(), format: new GeoJSON(),
wrapX: false wrapX: false

4
examples/modify-test.js
View File

@@ -5,7 +5,7 @@ import {defaults as defaultInteractions} from '../src/ol/interaction.js';
import _ol_interaction_Modify_ from '../src/ol/interaction/Modify.js'; import _ol_interaction_Modify_ from '../src/ol/interaction/Modify.js';
import _ol_interaction_Select_ from '../src/ol/interaction/Select.js'; import _ol_interaction_Select_ from '../src/ol/interaction/Select.js';
import VectorLayer from '../src/ol/layer/Vector.js'; import VectorLayer from '../src/ol/layer/Vector.js';
import _ol_source_Vector_ from '../src/ol/source/Vector.js'; import VectorSource from '../src/ol/source/Vector.js';
import _ol_style_Circle_ from '../src/ol/style/Circle.js'; import _ol_style_Circle_ from '../src/ol/style/Circle.js';
import _ol_style_Fill_ from '../src/ol/style/Fill.js'; import _ol_style_Fill_ from '../src/ol/style/Fill.js';
import _ol_style_Stroke_ from '../src/ol/style/Stroke.js'; import _ol_style_Stroke_ from '../src/ol/style/Stroke.js';
@@ -144,7 +144,7 @@ var geojsonObject = {
}] }]
}; };
var source = new _ol_source_Vector_({ var source = new VectorSource({
features: (new GeoJSON()).readFeatures(geojsonObject) features: (new GeoJSON()).readFeatures(geojsonObject)
}); });

4
examples/polygon-styles.js
View File

@@ -3,7 +3,7 @@ import View from '../src/ol/View.js';
import GeoJSON from '../src/ol/format/GeoJSON.js'; import GeoJSON from '../src/ol/format/GeoJSON.js';
import MultiPoint from '../src/ol/geom/MultiPoint.js'; import MultiPoint from '../src/ol/geom/MultiPoint.js';
import VectorLayer from '../src/ol/layer/Vector.js'; import VectorLayer from '../src/ol/layer/Vector.js';
import _ol_source_Vector_ from '../src/ol/source/Vector.js'; import VectorSource from '../src/ol/source/Vector.js';
import _ol_style_Circle_ from '../src/ol/style/Circle.js'; import _ol_style_Circle_ from '../src/ol/style/Circle.js';
import _ol_style_Fill_ from '../src/ol/style/Fill.js'; import _ol_style_Fill_ from '../src/ol/style/Fill.js';
import _ol_style_Stroke_ from '../src/ol/style/Stroke.js'; import _ol_style_Stroke_ from '../src/ol/style/Stroke.js';
@@ -80,7 +80,7 @@ var geojsonObject = {
}] }]
}; };
var source = new _ol_source_Vector_({ var source = new VectorSource({
features: (new GeoJSON()).readFeatures(geojsonObject) features: (new GeoJSON()).readFeatures(geojsonObject)
}); });

4
examples/regularshape.js
View File

@@ -3,7 +3,7 @@ import Map from '../src/ol/Map.js';
import View from '../src/ol/View.js'; import View from '../src/ol/View.js';
import Point from '../src/ol/geom/Point.js'; import Point from '../src/ol/geom/Point.js';
import VectorLayer from '../src/ol/layer/Vector.js'; import VectorLayer from '../src/ol/layer/Vector.js';
import _ol_source_Vector_ from '../src/ol/source/Vector.js'; import VectorSource from '../src/ol/source/Vector.js';
import _ol_style_Fill_ from '../src/ol/style/Fill.js'; import _ol_style_Fill_ from '../src/ol/style/Fill.js';
import _ol_style_RegularShape_ from '../src/ol/style/RegularShape.js'; import _ol_style_RegularShape_ from '../src/ol/style/RegularShape.js';
import _ol_style_Stroke_ from '../src/ol/style/Stroke.js'; import _ol_style_Stroke_ from '../src/ol/style/Stroke.js';
@@ -76,7 +76,7 @@ for (var i = 0; i < count; ++i) {
features[i].setStyle(styles[styleKeys[Math.floor(Math.random() * 5)]]); features[i].setStyle(styles[styleKeys[Math.floor(Math.random() * 5)]]);
} }
var source = new _ol_source_Vector_({ var source = new VectorSource({
features: features features: features
}); });

4
examples/select-features.js
View File

@@ -6,14 +6,14 @@ import _ol_interaction_Select_ from '../src/ol/interaction/Select.js';
import TileLayer from '../src/ol/layer/Tile.js'; import TileLayer from '../src/ol/layer/Tile.js';
import VectorLayer from '../src/ol/layer/Vector.js'; import VectorLayer from '../src/ol/layer/Vector.js';
import _ol_source_OSM_ from '../src/ol/source/OSM.js'; import _ol_source_OSM_ from '../src/ol/source/OSM.js';
import _ol_source_Vector_ from '../src/ol/source/Vector.js'; import VectorSource from '../src/ol/source/Vector.js';
var raster = new TileLayer({ var raster = new TileLayer({
source: new _ol_source_OSM_() source: new _ol_source_OSM_()
}); });
var vector = new VectorLayer({ var vector = new VectorLayer({
source: new _ol_source_Vector_({ source: new VectorSource({
url: 'data/geojson/countries.geojson', url: 'data/geojson/countries.geojson',
format: new GeoJSON() format: new GeoJSON()
}) })

4
examples/snap.js
View File

@@ -7,7 +7,7 @@ import _ol_interaction_Snap_ from '../src/ol/interaction/Snap.js';
import TileLayer from '../src/ol/layer/Tile.js'; import TileLayer from '../src/ol/layer/Tile.js';
import VectorLayer from '../src/ol/layer/Vector.js'; import VectorLayer from '../src/ol/layer/Vector.js';
import _ol_source_OSM_ from '../src/ol/source/OSM.js'; import _ol_source_OSM_ from '../src/ol/source/OSM.js';
import _ol_source_Vector_ from '../src/ol/source/Vector.js'; import VectorSource from '../src/ol/source/Vector.js';
import _ol_style_Circle_ from '../src/ol/style/Circle.js'; import _ol_style_Circle_ from '../src/ol/style/Circle.js';
import _ol_style_Fill_ from '../src/ol/style/Fill.js'; import _ol_style_Fill_ from '../src/ol/style/Fill.js';
import _ol_style_Stroke_ from '../src/ol/style/Stroke.js'; import _ol_style_Stroke_ from '../src/ol/style/Stroke.js';
@@ -18,7 +18,7 @@ var raster = new TileLayer({
}); });
var vector = new VectorLayer({ var vector = new VectorLayer({
source: new _ol_source_Vector_(), source: new VectorSource(),
style: new _ol_style_Style_({ style: new _ol_style_Style_({
fill: new _ol_style_Fill_({ fill: new _ol_style_Fill_({
color: 'rgba(255, 255, 255, 0.2)' color: 'rgba(255, 255, 255, 0.2)'

4
examples/sphere-mollweide.js
View File

@@ -4,7 +4,7 @@ import View from '../src/ol/View.js';
import GeoJSON from '../src/ol/format/GeoJSON.js'; import GeoJSON from '../src/ol/format/GeoJSON.js';
import VectorLayer from '../src/ol/layer/Vector.js'; import VectorLayer from '../src/ol/layer/Vector.js';
import _ol_proj_Projection_ from '../src/ol/proj/Projection.js'; import _ol_proj_Projection_ from '../src/ol/proj/Projection.js';
import _ol_source_Vector_ from '../src/ol/source/Vector.js'; import VectorSource from '../src/ol/source/Vector.js';
import {register} from '../src/ol/proj/proj4.js'; import {register} from '../src/ol/proj/proj4.js';
import proj4 from 'proj4'; import proj4 from 'proj4';
@@ -26,7 +26,7 @@ var map = new Map({
keyboardEventTarget: document, keyboardEventTarget: document,
layers: [ layers: [
new VectorLayer({ new VectorLayer({
source: new _ol_source_Vector_({ source: new VectorSource({
url: 'data/geojson/countries-110m.geojson', url: 'data/geojson/countries-110m.geojson',
format: new GeoJSON() format: new GeoJSON()
}) })

4
examples/street-labels.js
View File

@@ -5,7 +5,7 @@ import GeoJSON from '../src/ol/format/GeoJSON.js';
import TileLayer from '../src/ol/layer/Tile.js'; import TileLayer from '../src/ol/layer/Tile.js';
import VectorLayer from '../src/ol/layer/Vector.js'; import VectorLayer from '../src/ol/layer/Vector.js';
import _ol_source_BingMaps_ from '../src/ol/source/BingMaps.js'; import _ol_source_BingMaps_ from '../src/ol/source/BingMaps.js';
import _ol_source_Vector_ from '../src/ol/source/Vector.js'; import VectorSource from '../src/ol/source/Vector.js';
import _ol_style_Fill_ from '../src/ol/style/Fill.js'; import _ol_style_Fill_ from '../src/ol/style/Fill.js';
import _ol_style_Style_ from '../src/ol/style/Style.js'; import _ol_style_Style_ from '../src/ol/style/Style.js';
import _ol_style_Text_ from '../src/ol/style/Text.js'; import _ol_style_Text_ from '../src/ol/style/Text.js';
@@ -29,7 +29,7 @@ var map = new Map({
}) })
}), new VectorLayer({ }), new VectorLayer({
declutter: true, declutter: true,
source: new _ol_source_Vector_({ source: new VectorSource({
format: new GeoJSON(), format: new GeoJSON(),
url: 'data/geojson/vienna-streets.geojson' url: 'data/geojson/vienna-streets.geojson'
}), }),

4
examples/symbol-atlas-webgl.js
View File

@@ -3,7 +3,7 @@ import Map from '../src/ol/Map.js';
import View from '../src/ol/View.js'; import View from '../src/ol/View.js';
import Point from '../src/ol/geom/Point.js'; import Point from '../src/ol/geom/Point.js';
import VectorLayer from '../src/ol/layer/Vector.js'; import VectorLayer from '../src/ol/layer/Vector.js';
import _ol_source_Vector_ from '../src/ol/source/Vector.js'; import VectorSource from '../src/ol/source/Vector.js';
import _ol_style_AtlasManager_ from '../src/ol/style/AtlasManager.js'; import _ol_style_AtlasManager_ from '../src/ol/style/AtlasManager.js';
import _ol_style_Circle_ from '../src/ol/style/Circle.js'; import _ol_style_Circle_ from '../src/ol/style/Circle.js';
import _ol_style_Fill_ from '../src/ol/style/Fill.js'; import _ol_style_Fill_ from '../src/ol/style/Fill.js';
@@ -99,7 +99,7 @@ for (i = 0; i < featureCount; ++i) {
features[i] = feature; features[i] = feature;
} }
var vectorSource = new _ol_source_Vector_({ var vectorSource = new VectorSource({
features: features features: features
}); });
var vector = new VectorLayer({ var vector = new VectorLayer({

4
examples/synthetic-lines.js
View File

@@ -3,7 +3,7 @@ import Map from '../src/ol/Map.js';
import View from '../src/ol/View.js'; import View from '../src/ol/View.js';
import LineString from '../src/ol/geom/LineString.js'; import LineString from '../src/ol/geom/LineString.js';
import VectorLayer from '../src/ol/layer/Vector.js'; import VectorLayer from '../src/ol/layer/Vector.js';
import _ol_source_Vector_ from '../src/ol/source/Vector.js'; import VectorSource from '../src/ol/source/Vector.js';
import _ol_style_Stroke_ from '../src/ol/style/Stroke.js'; import _ol_style_Stroke_ from '../src/ol/style/Stroke.js';
import _ol_style_Style_ from '../src/ol/style/Style.js'; import _ol_style_Style_ from '../src/ol/style/Style.js';
@@ -37,7 +37,7 @@ for (i = 0; i < count; ++i) {
} }
var vector = new VectorLayer({ var vector = new VectorLayer({
source: new _ol_source_Vector_({ source: new VectorSource({
features: features, features: features,
wrapX: false wrapX: false
}), }),

4
examples/synthetic-points.js
View File

@@ -4,7 +4,7 @@ import View from '../src/ol/View.js';
import LineString from '../src/ol/geom/LineString.js'; import LineString from '../src/ol/geom/LineString.js';
import Point from '../src/ol/geom/Point.js'; import Point from '../src/ol/geom/Point.js';
import VectorLayer from '../src/ol/layer/Vector.js'; import VectorLayer from '../src/ol/layer/Vector.js';
import _ol_source_Vector_ from '../src/ol/source/Vector.js'; import VectorSource from '../src/ol/source/Vector.js';
import _ol_style_Circle_ from '../src/ol/style/Circle.js'; import _ol_style_Circle_ from '../src/ol/style/Circle.js';
import _ol_style_Fill_ from '../src/ol/style/Fill.js'; import _ol_style_Fill_ from '../src/ol/style/Fill.js';
import _ol_style_Stroke_ from '../src/ol/style/Stroke.js'; import _ol_style_Stroke_ from '../src/ol/style/Stroke.js';
@@ -40,7 +40,7 @@ var styles = {
}) })
}; };
var vectorSource = new _ol_source_Vector_({ var vectorSource = new VectorSource({
features: features, features: features,
wrapX: false wrapX: false
}); });

6
examples/tissot.js
View File

@@ -5,14 +5,14 @@ import {circular as circularPolygon} from '../src/ol/geom/Polygon.js';
import TileLayer from '../src/ol/layer/Tile.js'; import TileLayer from '../src/ol/layer/Tile.js';
import VectorLayer from '../src/ol/layer/Vector.js'; import VectorLayer from '../src/ol/layer/Vector.js';
import _ol_source_TileWMS_ from '../src/ol/source/TileWMS.js'; import _ol_source_TileWMS_ from '../src/ol/source/TileWMS.js';
import _ol_source_Vector_ from '../src/ol/source/Vector.js'; import VectorSource from '../src/ol/source/Vector.js';
var vectorLayer4326 = new VectorLayer({ var vectorLayer4326 = new VectorLayer({
source: new _ol_source_Vector_() source: new VectorSource()
}); });
var vectorLayer3857 = new VectorLayer({ var vectorLayer3857 = new VectorLayer({
source: new _ol_source_Vector_() source: new VectorSource()
}); });
var map4326 = new Map({ var map4326 = new Map({

4
examples/topojson.js
View File

@@ -4,7 +4,7 @@ import TopoJSON from '../src/ol/format/TopoJSON.js';
import TileLayer from '../src/ol/layer/Tile.js'; import TileLayer from '../src/ol/layer/Tile.js';
import VectorLayer from '../src/ol/layer/Vector.js'; import VectorLayer from '../src/ol/layer/Vector.js';
import _ol_source_TileJSON_ from '../src/ol/source/TileJSON.js'; import _ol_source_TileJSON_ from '../src/ol/source/TileJSON.js';
import _ol_source_Vector_ from '../src/ol/source/Vector.js'; import VectorSource from '../src/ol/source/Vector.js';
import _ol_style_Fill_ from '../src/ol/style/Fill.js'; import _ol_style_Fill_ from '../src/ol/style/Fill.js';
import _ol_style_Stroke_ from '../src/ol/style/Stroke.js'; import _ol_style_Stroke_ from '../src/ol/style/Stroke.js';
import _ol_style_Style_ from '../src/ol/style/Style.js'; import _ol_style_Style_ from '../src/ol/style/Style.js';
@@ -27,7 +27,7 @@ var style = new _ol_style_Style_({
}); });
var vector = new VectorLayer({ var vector = new VectorLayer({
source: new _ol_source_Vector_({ source: new VectorSource({
url: 'data/topojson/world-110m.json', url: 'data/topojson/world-110m.json',
format: new TopoJSON({ format: new TopoJSON({
// don't want to render the full world polygon (stored as 'land' layer), // don't want to render the full world polygon (stored as 'land' layer),

8
examples/topolis.js
View File

@@ -12,7 +12,7 @@ import _ol_interaction_Snap_ from '../src/ol/interaction/Snap.js';
import TileLayer from '../src/ol/layer/Tile.js'; import TileLayer from '../src/ol/layer/Tile.js';
import VectorLayer from '../src/ol/layer/Vector.js'; import VectorLayer from '../src/ol/layer/Vector.js';
import _ol_source_OSM_ from '../src/ol/source/OSM.js'; import _ol_source_OSM_ from '../src/ol/source/OSM.js';
import _ol_source_Vector_ from '../src/ol/source/Vector.js'; import VectorSource from '../src/ol/source/Vector.js';
import _ol_style_Style_ from '../src/ol/style/Style.js'; import _ol_style_Style_ from '../src/ol/style/Style.js';
import _ol_style_Stroke_ from '../src/ol/style/Stroke.js'; import _ol_style_Stroke_ from '../src/ol/style/Stroke.js';
import _ol_style_Fill_ from '../src/ol/style/Fill.js'; import _ol_style_Fill_ from '../src/ol/style/Fill.js';
@@ -24,7 +24,7 @@ var raster = new TileLayer({
source: new _ol_source_OSM_() source: new _ol_source_OSM_()
}); });
var nodes = new _ol_source_Vector_({wrapX: false}); var nodes = new VectorSource({wrapX: false});
var nodesLayer = new VectorLayer({ var nodesLayer = new VectorLayer({
source: nodes, source: nodes,
style: function(f) { style: function(f) {
@@ -47,7 +47,7 @@ var nodesLayer = new VectorLayer({
} }
}); });
var edges = new _ol_source_Vector_({wrapX: false}); var edges = new VectorSource({wrapX: false});
var edgesLayer = new VectorLayer({ var edgesLayer = new VectorLayer({
source: edges, source: edges,
style: function(f) { style: function(f) {
@@ -69,7 +69,7 @@ var edgesLayer = new VectorLayer({
} }
}); });
var faces = new _ol_source_Vector_({wrapX: false}); var faces = new VectorSource({wrapX: false});
var facesLayer = new VectorLayer({ var facesLayer = new VectorLayer({
source: faces, source: faces,
style: function(f) { style: function(f) {

4
examples/translate-features.js
View File

@@ -7,7 +7,7 @@ import _ol_interaction_Translate_ from '../src/ol/interaction/Translate.js';
import TileLayer from '../src/ol/layer/Tile.js'; import TileLayer from '../src/ol/layer/Tile.js';
import VectorLayer from '../src/ol/layer/Vector.js'; import VectorLayer from '../src/ol/layer/Vector.js';
import _ol_source_OSM_ from '../src/ol/source/OSM.js'; import _ol_source_OSM_ from '../src/ol/source/OSM.js';
import _ol_source_Vector_ from '../src/ol/source/Vector.js'; import VectorSource from '../src/ol/source/Vector.js';
var raster = new TileLayer({ var raster = new TileLayer({
@@ -15,7 +15,7 @@ var raster = new TileLayer({
}); });
var vector = new VectorLayer({ var vector = new VectorLayer({
source: new _ol_source_Vector_({ source: new VectorSource({
url: 'data/geojson/countries.geojson', url: 'data/geojson/countries.geojson',
format: new GeoJSON() format: new GeoJSON()
}) })

4
examples/turf.js
View File

@@ -7,10 +7,10 @@ import TileLayer from '../src/ol/layer/Tile.js';
import VectorLayer from '../src/ol/layer/Vector.js'; import VectorLayer from '../src/ol/layer/Vector.js';
import {fromLonLat} from '../src/ol/proj.js'; import {fromLonLat} from '../src/ol/proj.js';
import _ol_source_OSM_ from '../src/ol/source/OSM.js'; import _ol_source_OSM_ from '../src/ol/source/OSM.js';
import _ol_source_Vector_ from '../src/ol/source/Vector.js'; import VectorSource from '../src/ol/source/Vector.js';
var source = new _ol_source_Vector_(); var source = new VectorSource();
fetch('data/geojson/roads-seoul.geojson').then(function(response) { fetch('data/geojson/roads-seoul.geojson').then(function(response) {
return response.json(); return response.json();
}).then(function(json) { }).then(function(json) {

4
examples/vector-esri-edit.js
View File

@@ -9,7 +9,7 @@ import TileLayer from '../src/ol/layer/Tile.js';
import VectorLayer from '../src/ol/layer/Vector.js'; import VectorLayer from '../src/ol/layer/Vector.js';
import _ol_loadingstrategy_ from '../src/ol/loadingstrategy.js'; import _ol_loadingstrategy_ from '../src/ol/loadingstrategy.js';
import {fromLonLat} from '../src/ol/proj.js'; import {fromLonLat} from '../src/ol/proj.js';
import _ol_source_Vector_ from '../src/ol/source/Vector.js'; import VectorSource from '../src/ol/source/Vector.js';
import _ol_source_XYZ_ from '../src/ol/source/XYZ.js'; import _ol_source_XYZ_ from '../src/ol/source/XYZ.js';
import _ol_tilegrid_ from '../src/ol/tilegrid.js'; import _ol_tilegrid_ from '../src/ol/tilegrid.js';
@@ -20,7 +20,7 @@ var layer = '0';
var esrijsonFormat = new EsriJSON(); var esrijsonFormat = new EsriJSON();
var vectorSource = new _ol_source_Vector_({ var vectorSource = new VectorSource({
loader: function(extent, resolution, projection) { loader: function(extent, resolution, projection) {
var url = serviceUrl + layer + '/query/?f=json&' + var url = serviceUrl + layer + '/query/?f=json&' +
'returnGeometry=true&spatialRel=esriSpatialRelIntersects&geometry=' + 'returnGeometry=true&spatialRel=esriSpatialRelIntersects&geometry=' +

4
examples/vector-esri.js
View File

@@ -5,7 +5,7 @@ import TileLayer from '../src/ol/layer/Tile.js';
import VectorLayer from '../src/ol/layer/Vector.js'; import VectorLayer from '../src/ol/layer/Vector.js';
import _ol_loadingstrategy_ from '../src/ol/loadingstrategy.js'; import _ol_loadingstrategy_ from '../src/ol/loadingstrategy.js';
import {fromLonLat} from '../src/ol/proj.js'; import {fromLonLat} from '../src/ol/proj.js';
import _ol_source_Vector_ from '../src/ol/source/Vector.js'; import VectorSource from '../src/ol/source/Vector.js';
import _ol_source_XYZ_ from '../src/ol/source/XYZ.js'; import _ol_source_XYZ_ from '../src/ol/source/XYZ.js';
import _ol_style_Fill_ from '../src/ol/style/Fill.js'; import _ol_style_Fill_ from '../src/ol/style/Fill.js';
import _ol_style_Stroke_ from '../src/ol/style/Stroke.js'; import _ol_style_Stroke_ from '../src/ol/style/Stroke.js';
@@ -58,7 +58,7 @@ var styleCache = {
}) })
}; };
var vectorSource = new _ol_source_Vector_({ var vectorSource = new VectorSource({
loader: function(extent, resolution, projection) { loader: function(extent, resolution, projection) {
var url = serviceUrl + layer + '/query/?f=json&' + var url = serviceUrl + layer + '/query/?f=json&' +
'returnGeometry=true&spatialRel=esriSpatialRelIntersects&geometry=' + 'returnGeometry=true&spatialRel=esriSpatialRelIntersects&geometry=' +

4
examples/vector-label-decluttering.js
View File

@@ -3,7 +3,7 @@ import View from '../src/ol/View.js';
import * as _ol_extent_ from '../src/ol/extent.js'; import * as _ol_extent_ from '../src/ol/extent.js';
import GeoJSON from '../src/ol/format/GeoJSON.js'; import GeoJSON from '../src/ol/format/GeoJSON.js';
import VectorLayer from '../src/ol/layer/Vector.js'; import VectorLayer from '../src/ol/layer/Vector.js';
import _ol_source_Vector_ from '../src/ol/source/Vector.js'; import VectorSource from '../src/ol/source/Vector.js';
import _ol_style_Fill_ from '../src/ol/style/Fill.js'; import _ol_style_Fill_ from '../src/ol/style/Fill.js';
import _ol_style_Stroke_ from '../src/ol/style/Stroke.js'; import _ol_style_Stroke_ from '../src/ol/style/Stroke.js';
import _ol_style_Style_ from '../src/ol/style/Style.js'; import _ol_style_Style_ from '../src/ol/style/Style.js';
@@ -59,7 +59,7 @@ var countryStyle = new _ol_style_Style_({
var style = [countryStyle, labelStyle]; var style = [countryStyle, labelStyle];
var vectorLayer = new VectorLayer({ var vectorLayer = new VectorLayer({
source: new _ol_source_Vector_({ source: new VectorSource({
url: 'data/geojson/countries.geojson', url: 'data/geojson/countries.geojson',
format: new GeoJSON() format: new GeoJSON()
}), }),

8
examples/vector-labels.js
View File

@@ -4,7 +4,7 @@ import GeoJSON from '../src/ol/format/GeoJSON.js';
import TileLayer from '../src/ol/layer/Tile.js'; import TileLayer from '../src/ol/layer/Tile.js';
import VectorLayer from '../src/ol/layer/Vector.js'; import VectorLayer from '../src/ol/layer/Vector.js';
import _ol_source_OSM_ from '../src/ol/source/OSM.js'; import _ol_source_OSM_ from '../src/ol/source/OSM.js';
import _ol_source_Vector_ from '../src/ol/source/Vector.js'; import VectorSource from '../src/ol/source/Vector.js';
import _ol_style_Circle_ from '../src/ol/style/Circle.js'; import _ol_style_Circle_ from '../src/ol/style/Circle.js';
import _ol_style_Fill_ from '../src/ol/style/Fill.js'; import _ol_style_Fill_ from '../src/ol/style/Fill.js';
import _ol_style_Stroke_ from '../src/ol/style/Stroke.js'; import _ol_style_Stroke_ from '../src/ol/style/Stroke.js';
@@ -141,7 +141,7 @@ function polygonStyleFunction(feature, resolution) {
} }
var vectorPolygons = new VectorLayer({ var vectorPolygons = new VectorLayer({
source: new _ol_source_Vector_({ source: new VectorSource({
url: 'data/geojson/polygon-samples.geojson', url: 'data/geojson/polygon-samples.geojson',
format: new GeoJSON() format: new GeoJSON()
}), }),
@@ -161,7 +161,7 @@ function lineStyleFunction(feature, resolution) {
} }
var vectorLines = new VectorLayer({ var vectorLines = new VectorLayer({
source: new _ol_source_Vector_({ source: new VectorSource({
url: 'data/geojson/line-samples.geojson', url: 'data/geojson/line-samples.geojson',
format: new GeoJSON() format: new GeoJSON()
}), }),
@@ -182,7 +182,7 @@ function pointStyleFunction(feature, resolution) {
} }
var vectorPoints = new VectorLayer({ var vectorPoints = new VectorLayer({
source: new _ol_source_Vector_({ source: new VectorSource({
url: 'data/geojson/point-samples.geojson', url: 'data/geojson/point-samples.geojson',
format: new GeoJSON() format: new GeoJSON()
}), }),

6
examples/vector-layer.js
View File

@@ -2,7 +2,7 @@ import Map from '../src/ol/Map.js';
import View from '../src/ol/View.js'; import View from '../src/ol/View.js';
import GeoJSON from '../src/ol/format/GeoJSON.js'; import GeoJSON from '../src/ol/format/GeoJSON.js';
import VectorLayer from '../src/ol/layer/Vector.js'; import VectorLayer from '../src/ol/layer/Vector.js';
import _ol_source_Vector_ from '../src/ol/source/Vector.js'; import VectorSource from '../src/ol/source/Vector.js';
import _ol_style_Fill_ from '../src/ol/style/Fill.js'; import _ol_style_Fill_ from '../src/ol/style/Fill.js';
import _ol_style_Stroke_ from '../src/ol/style/Stroke.js'; import _ol_style_Stroke_ from '../src/ol/style/Stroke.js';
import _ol_style_Style_ from '../src/ol/style/Style.js'; import _ol_style_Style_ from '../src/ol/style/Style.js';
@@ -30,7 +30,7 @@ var style = new _ol_style_Style_({
}); });
var vectorLayer = new VectorLayer({ var vectorLayer = new VectorLayer({
source: new _ol_source_Vector_({ source: new VectorSource({
url: 'data/geojson/countries.geojson', url: 'data/geojson/countries.geojson',
format: new GeoJSON() format: new GeoJSON()
}), }),
@@ -70,7 +70,7 @@ var highlightStyle = new _ol_style_Style_({
}); });
var featureOverlay = new VectorLayer({ var featureOverlay = new VectorLayer({
source: new _ol_source_Vector_(), source: new VectorSource(),
map: map, map: map,
style: function(feature) { style: function(feature) {
highlightStyle.getText().setText(feature.get('name')); highlightStyle.getText().setText(feature.get('name'));

4
examples/vector-osm.js
View File

@@ -7,7 +7,7 @@ import VectorLayer from '../src/ol/layer/Vector.js';
import _ol_loadingstrategy_ from '../src/ol/loadingstrategy.js'; import _ol_loadingstrategy_ from '../src/ol/loadingstrategy.js';
import {transformExtent} from '../src/ol/proj.js'; import {transformExtent} from '../src/ol/proj.js';
import _ol_source_BingMaps_ from '../src/ol/source/BingMaps.js'; import _ol_source_BingMaps_ from '../src/ol/source/BingMaps.js';
import _ol_source_Vector_ from '../src/ol/source/Vector.js'; import VectorSource from '../src/ol/source/Vector.js';
import _ol_style_Circle_ from '../src/ol/style/Circle.js'; import _ol_style_Circle_ from '../src/ol/style/Circle.js';
import _ol_style_Fill_ from '../src/ol/style/Fill.js'; import _ol_style_Fill_ from '../src/ol/style/Fill.js';
import _ol_style_Stroke_ from '../src/ol/style/Stroke.js'; import _ol_style_Stroke_ from '../src/ol/style/Stroke.js';
@@ -77,7 +77,7 @@ var styles = {
} }
}; };
var vectorSource = new _ol_source_Vector_({ var vectorSource = new VectorSource({
format: new OSMXML(), format: new OSMXML(),
loader: function(extent, resolution, projection) { loader: function(extent, resolution, projection) {
var epsg4326Extent = transformExtent(extent, projection, 'EPSG:4326'); var epsg4326Extent = transformExtent(extent, projection, 'EPSG:4326');

4
examples/vector-wfs-getfeature.js
View File

@@ -6,12 +6,12 @@ import GeoJSON from '../src/ol/format/GeoJSON.js';
import TileLayer from '../src/ol/layer/Tile.js'; import TileLayer from '../src/ol/layer/Tile.js';
import VectorLayer from '../src/ol/layer/Vector.js'; import VectorLayer from '../src/ol/layer/Vector.js';
import _ol_source_BingMaps_ from '../src/ol/source/BingMaps.js'; import _ol_source_BingMaps_ from '../src/ol/source/BingMaps.js';
import _ol_source_Vector_ from '../src/ol/source/Vector.js'; import VectorSource from '../src/ol/source/Vector.js';
import _ol_style_Stroke_ from '../src/ol/style/Stroke.js'; import _ol_style_Stroke_ from '../src/ol/style/Stroke.js';
import _ol_style_Style_ from '../src/ol/style/Style.js'; import _ol_style_Style_ from '../src/ol/style/Style.js';
var vectorSource = new _ol_source_Vector_(); var vectorSource = new VectorSource();
var vector = new VectorLayer({ var vector = new VectorLayer({
source: vectorSource, source: vectorSource,
style: new _ol_style_Style_({ style: new _ol_style_Style_({

4
examples/vector-wfs.js
View File

@@ -5,12 +5,12 @@ import TileLayer from '../src/ol/layer/Tile.js';
import VectorLayer from '../src/ol/layer/Vector.js'; import VectorLayer from '../src/ol/layer/Vector.js';
import _ol_loadingstrategy_ from '../src/ol/loadingstrategy.js'; import _ol_loadingstrategy_ from '../src/ol/loadingstrategy.js';
import _ol_source_BingMaps_ from '../src/ol/source/BingMaps.js'; import _ol_source_BingMaps_ from '../src/ol/source/BingMaps.js';
import _ol_source_Vector_ from '../src/ol/source/Vector.js'; import VectorSource from '../src/ol/source/Vector.js';
import _ol_style_Stroke_ from '../src/ol/style/Stroke.js'; import _ol_style_Stroke_ from '../src/ol/style/Stroke.js';
import _ol_style_Style_ from '../src/ol/style/Style.js'; import _ol_style_Style_ from '../src/ol/style/Style.js';
var vectorSource = new _ol_source_Vector_({ var vectorSource = new VectorSource({
format: new GeoJSON(), format: new GeoJSON(),
url: function(extent) { url: function(extent) {
return 'https://ahocevar.com/geoserver/wfs?service=WFS&' + return 'https://ahocevar.com/geoserver/wfs?service=WFS&' +

4
examples/wkt.js
View File

@@ -4,7 +4,7 @@ import WKT from '../src/ol/format/WKT.js';
import TileLayer from '../src/ol/layer/Tile.js'; import TileLayer from '../src/ol/layer/Tile.js';
import VectorLayer from '../src/ol/layer/Vector.js'; import VectorLayer from '../src/ol/layer/Vector.js';
import _ol_source_OSM_ from '../src/ol/source/OSM.js'; import _ol_source_OSM_ from '../src/ol/source/OSM.js';
import _ol_source_Vector_ from '../src/ol/source/Vector.js'; import VectorSource from '../src/ol/source/Vector.js';
var raster = new TileLayer({ var raster = new TileLayer({
source: new _ol_source_OSM_() source: new _ol_source_OSM_()
@@ -22,7 +22,7 @@ var feature = format.readFeature(wkt, {
}); });
var vector = new VectorLayer({ var vector = new VectorLayer({
source: new _ol_source_Vector_({ source: new VectorSource({
features: [feature] features: [feature]
}) })
}); });

4
src/ol/interaction/Draw.js
View File

@@ -23,7 +23,7 @@ import DrawEventType from '../interaction/DrawEventType.js';
import _ol_interaction_Pointer_ from '../interaction/Pointer.js'; import _ol_interaction_Pointer_ from '../interaction/Pointer.js';
import _ol_interaction_Property_ from '../interaction/Property.js'; import _ol_interaction_Property_ from '../interaction/Property.js';
import VectorLayer from '../layer/Vector.js'; import VectorLayer from '../layer/Vector.js';
import _ol_source_Vector_ from '../source/Vector.js'; import VectorSource from '../source/Vector.js';
import _ol_style_Style_ from '../style/Style.js'; import _ol_style_Style_ from '../style/Style.js';
/** /**
@@ -250,7 +250,7 @@ var Draw = function(options) {
* @private * @private
*/ */
this.overlay_ = new VectorLayer({ this.overlay_ = new VectorLayer({
source: new _ol_source_Vector_({ source: new VectorSource({
useSpatialIndex: false, useSpatialIndex: false,
wrapX: options.wrapX ? options.wrapX : false wrapX: options.wrapX ? options.wrapX : false
}), }),

6
src/ol/interaction/Extent.js
View File

@@ -14,7 +14,7 @@ import {fromExtent as polygonFromExtent} from '../geom/Polygon.js';
import _ol_interaction_ExtentEventType_ from '../interaction/ExtentEventType.js'; import _ol_interaction_ExtentEventType_ from '../interaction/ExtentEventType.js';
import _ol_interaction_Pointer_ from '../interaction/Pointer.js'; import _ol_interaction_Pointer_ from '../interaction/Pointer.js';
import VectorLayer from '../layer/Vector.js'; import VectorLayer from '../layer/Vector.js';
import _ol_source_Vector_ from '../source/Vector.js'; import VectorSource from '../source/Vector.js';
import _ol_style_Style_ from '../style/Style.js'; import _ol_style_Style_ from '../style/Style.js';
/** /**
@@ -94,7 +94,7 @@ var _ol_interaction_Extent_ = function(opt_options) {
* @private * @private
*/ */
this.extentOverlay_ = new VectorLayer({ this.extentOverlay_ = new VectorLayer({
source: new _ol_source_Vector_({ source: new VectorSource({
useSpatialIndex: false, useSpatialIndex: false,
wrapX: !!opt_options.wrapX wrapX: !!opt_options.wrapX
}), }),
@@ -109,7 +109,7 @@ var _ol_interaction_Extent_ = function(opt_options) {
* @private * @private
*/ */
this.vertexOverlay_ = new VectorLayer({ this.vertexOverlay_ = new VectorLayer({
source: new _ol_source_Vector_({ source: new VectorSource({
useSpatialIndex: false, useSpatialIndex: false,
wrapX: !!opt_options.wrapX wrapX: !!opt_options.wrapX
}), }),

4
src/ol/interaction/Modify.js
View File

@@ -19,7 +19,7 @@ import Point from '../geom/Point.js';
import _ol_interaction_ModifyEventType_ from '../interaction/ModifyEventType.js'; import _ol_interaction_ModifyEventType_ from '../interaction/ModifyEventType.js';
import _ol_interaction_Pointer_ from '../interaction/Pointer.js'; import _ol_interaction_Pointer_ from '../interaction/Pointer.js';
import VectorLayer from '../layer/Vector.js'; import VectorLayer from '../layer/Vector.js';
import _ol_source_Vector_ from '../source/Vector.js'; import VectorSource from '../source/Vector.js';
import VectorEventType from '../source/VectorEventType.js'; import VectorEventType from '../source/VectorEventType.js';
import RBush from '../structs/RBush.js'; import RBush from '../structs/RBush.js';
import _ol_style_Style_ from '../style/Style.js'; import _ol_style_Style_ from '../style/Style.js';
@@ -158,7 +158,7 @@ var _ol_interaction_Modify_ = function(options) {
* @private * @private
*/ */
this.overlay_ = new VectorLayer({ this.overlay_ = new VectorLayer({
source: new _ol_source_Vector_({ source: new VectorSource({
useSpatialIndex: false, useSpatialIndex: false,
wrapX: !!options.wrapX wrapX: !!options.wrapX
}), }),

4
src/ol/interaction/Select.js
View File

@@ -12,7 +12,7 @@ import GeometryType from '../geom/GeometryType.js';
import Interaction from '../interaction/Interaction.js'; import Interaction from '../interaction/Interaction.js';
import VectorLayer from '../layer/Vector.js'; import VectorLayer from '../layer/Vector.js';
import _ol_obj_ from '../obj.js'; import _ol_obj_ from '../obj.js';
import _ol_source_Vector_ from '../source/Vector.js'; import VectorSource from '../source/Vector.js';
import _ol_style_Style_ from '../style/Style.js'; import _ol_style_Style_ from '../style/Style.js';
/** /**
@@ -88,7 +88,7 @@ var _ol_interaction_Select_ = function(opt_options) {
this.hitTolerance_ = options.hitTolerance ? options.hitTolerance : 0; this.hitTolerance_ = options.hitTolerance ? options.hitTolerance : 0;
var featureOverlay = new VectorLayer({ var featureOverlay = new VectorLayer({
source: new _ol_source_Vector_({ source: new VectorSource({
useSpatialIndex: false, useSpatialIndex: false,
features: options.features, features: options.features,
wrapX: options.wrapX wrapX: options.wrapX

6
src/ol/interaction/Snap.js
View File

@@ -13,7 +13,7 @@ import GeometryType from '../geom/GeometryType.js';
import {fromCircle} from '../geom/Polygon.js'; import {fromCircle} from '../geom/Polygon.js';
import _ol_interaction_Pointer_ from '../interaction/Pointer.js'; import _ol_interaction_Pointer_ from '../interaction/Pointer.js';
import _ol_obj_ from '../obj.js'; import _ol_obj_ from '../obj.js';
import _ol_source_Vector_ from '../source/Vector.js'; import VectorSource from '../source/Vector.js';
import VectorEventType from '../source/VectorEventType.js'; import VectorEventType from '../source/VectorEventType.js';
import RBush from '../structs/RBush.js'; import RBush from '../structs/RBush.js';
@@ -219,7 +219,7 @@ _ol_interaction_Snap_.prototype.getFeatures_ = function() {
*/ */
_ol_interaction_Snap_.prototype.handleFeatureAdd_ = function(evt) { _ol_interaction_Snap_.prototype.handleFeatureAdd_ = function(evt) {
var feature; var feature;
if (evt instanceof _ol_source_Vector_.Event) { if (evt instanceof VectorSource.Event) {
feature = evt.feature; feature = evt.feature;
} else if (evt instanceof _ol_Collection_.Event) { } else if (evt instanceof _ol_Collection_.Event) {
feature = evt.element; feature = evt.element;
@@ -234,7 +234,7 @@ _ol_interaction_Snap_.prototype.handleFeatureAdd_ = function(evt) {
*/ */
_ol_interaction_Snap_.prototype.handleFeatureRemove_ = function(evt) { _ol_interaction_Snap_.prototype.handleFeatureRemove_ = function(evt) {
var feature; var feature;
if (evt instanceof _ol_source_Vector_.Event) { if (evt instanceof VectorSource.Event) {
feature = evt.feature; feature = evt.feature;
} else if (evt instanceof _ol_Collection_.Event) { } else if (evt instanceof _ol_Collection_.Event) {
feature = evt.element; feature = evt.element;

8
src/ol/source/Cluster.js
View File

@@ -9,7 +9,7 @@ import _ol_coordinate_ from '../coordinate.js';
import EventType from '../events/EventType.js'; import EventType from '../events/EventType.js';
import {buffer, createEmpty, createOrUpdateFromCoordinate} from '../extent.js'; import {buffer, createEmpty, createOrUpdateFromCoordinate} from '../extent.js';
import Point from '../geom/Point.js'; import Point from '../geom/Point.js';
import _ol_source_Vector_ from '../source/Vector.js'; import VectorSource from '../source/Vector.js';
/** /**
* @classdesc * @classdesc
@@ -23,7 +23,7 @@ import _ol_source_Vector_ from '../source/Vector.js';
* @api * @api
*/ */
var _ol_source_Cluster_ = function(options) { var _ol_source_Cluster_ = function(options) {
_ol_source_Vector_.call(this, { VectorSource.call(this, {
attributions: options.attributions, attributions: options.attributions,
extent: options.extent, extent: options.extent,
projection: options.projection, projection: options.projection,
@@ -70,7 +70,7 @@ var _ol_source_Cluster_ = function(options) {
_ol_source_Cluster_.prototype.refresh, this); _ol_source_Cluster_.prototype.refresh, this);
}; };
inherits(_ol_source_Cluster_, _ol_source_Vector_); inherits(_ol_source_Cluster_, VectorSource);
/** /**
@@ -127,7 +127,7 @@ _ol_source_Cluster_.prototype.refresh = function() {
this.clear(); this.clear();
this.cluster(); this.cluster();
this.addFeatures(this.features); this.addFeatures(this.features);
_ol_source_Vector_.prototype.refresh.call(this); VectorSource.prototype.refresh.call(this);
}; };

82
src/ol/source/Vector.js
View File

@@ -33,7 +33,7 @@ import RBush from '../structs/RBush.js';
* @param {olx.source.VectorOptions=} opt_options Vector source options. * @param {olx.source.VectorOptions=} opt_options Vector source options.
* @api * @api
*/ */
var _ol_source_Vector_ = function(opt_options) { var VectorSource = function(opt_options) {
var options = opt_options || {}; var options = opt_options || {};
@@ -149,7 +149,7 @@ var _ol_source_Vector_ = function(opt_options) {
}; };
inherits(_ol_source_Vector_, Source); inherits(VectorSource, Source);
/** /**
@@ -161,7 +161,7 @@ inherits(_ol_source_Vector_, Source);
* @param {ol.Feature} feature Feature to add. * @param {ol.Feature} feature Feature to add.
* @api * @api
*/ */
_ol_source_Vector_.prototype.addFeature = function(feature) { VectorSource.prototype.addFeature = function(feature) {
this.addFeatureInternal(feature); this.addFeatureInternal(feature);
this.changed(); this.changed();
}; };
@@ -172,7 +172,7 @@ _ol_source_Vector_.prototype.addFeature = function(feature) {
* @param {ol.Feature} feature Feature. * @param {ol.Feature} feature Feature.
* @protected * @protected
*/ */
_ol_source_Vector_.prototype.addFeatureInternal = function(feature) { VectorSource.prototype.addFeatureInternal = function(feature) {
var featureKey = getUid(feature).toString(); var featureKey = getUid(feature).toString();
if (!this.addToIndex_(featureKey, feature)) { if (!this.addToIndex_(featureKey, feature)) {
@@ -192,7 +192,7 @@ _ol_source_Vector_.prototype.addFeatureInternal = function(feature) {
} }
this.dispatchEvent( this.dispatchEvent(
new _ol_source_Vector_.Event(VectorEventType.ADDFEATURE, feature)); new VectorSource.Event(VectorEventType.ADDFEATURE, feature));
}; };
@@ -201,7 +201,7 @@ _ol_source_Vector_.prototype.addFeatureInternal = function(feature) {
* @param {ol.Feature} feature The feature. * @param {ol.Feature} feature The feature.
* @private * @private
*/ */
_ol_source_Vector_.prototype.setupChangeEvents_ = function(featureKey, feature) { VectorSource.prototype.setupChangeEvents_ = function(featureKey, feature) {
this.featureChangeKeys_[featureKey] = [ this.featureChangeKeys_[featureKey] = [
_ol_events_.listen(feature, EventType.CHANGE, _ol_events_.listen(feature, EventType.CHANGE,
this.handleFeatureChange_, this), this.handleFeatureChange_, this),
@@ -218,7 +218,7 @@ _ol_source_Vector_.prototype.setupChangeEvents_ = function(featureKey, feature)
* candidate for insertion into the Rtree. * candidate for insertion into the Rtree.
* @private * @private
*/ */
_ol_source_Vector_.prototype.addToIndex_ = function(featureKey, feature) { VectorSource.prototype.addToIndex_ = function(featureKey, feature) {
var valid = true; var valid = true;
var id = feature.getId(); var id = feature.getId();
if (id !== undefined) { if (id !== undefined) {
@@ -241,7 +241,7 @@ _ol_source_Vector_.prototype.addToIndex_ = function(featureKey, feature) {
* @param {Array.<ol.Feature>} features Features to add. * @param {Array.<ol.Feature>} features Features to add.
* @api * @api
*/ */
_ol_source_Vector_.prototype.addFeatures = function(features) { VectorSource.prototype.addFeatures = function(features) {
this.addFeaturesInternal(features); this.addFeaturesInternal(features);
this.changed(); this.changed();
}; };
@@ -252,7 +252,7 @@ _ol_source_Vector_.prototype.addFeatures = function(features) {
* @param {Array.<ol.Feature>} features Features. * @param {Array.<ol.Feature>} features Features.
* @protected * @protected
*/ */
_ol_source_Vector_.prototype.addFeaturesInternal = function(features) { VectorSource.prototype.addFeaturesInternal = function(features) {
var featureKey, i, length, feature; var featureKey, i, length, feature;
var extents = []; var extents = [];
@@ -286,7 +286,7 @@ _ol_source_Vector_.prototype.addFeaturesInternal = function(features) {
} }
for (i = 0, length = newFeatures.length; i < length; i++) { for (i = 0, length = newFeatures.length; i < length; i++) {
this.dispatchEvent(new _ol_source_Vector_.Event( this.dispatchEvent(new VectorSource.Event(
VectorEventType.ADDFEATURE, newFeatures[i])); VectorEventType.ADDFEATURE, newFeatures[i]));
} }
}; };
@@ -296,7 +296,7 @@ _ol_source_Vector_.prototype.addFeaturesInternal = function(features) {
* @param {!ol.Collection.<ol.Feature>} collection Collection. * @param {!ol.Collection.<ol.Feature>} collection Collection.
* @private * @private
*/ */
_ol_source_Vector_.prototype.bindFeaturesCollection_ = function(collection) { VectorSource.prototype.bindFeaturesCollection_ = function(collection) {
var modifyingCollection = false; var modifyingCollection = false;
_ol_events_.listen(this, VectorEventType.ADDFEATURE, _ol_events_.listen(this, VectorEventType.ADDFEATURE,
function(evt) { function(evt) {
@@ -339,7 +339,7 @@ _ol_source_Vector_.prototype.bindFeaturesCollection_ = function(collection) {
* @param {boolean=} opt_fast Skip dispatching of {@link removefeature} events. * @param {boolean=} opt_fast Skip dispatching of {@link removefeature} events.
* @api * @api
*/ */
_ol_source_Vector_.prototype.clear = function(opt_fast) { VectorSource.prototype.clear = function(opt_fast) {
if (opt_fast) { if (opt_fast) {
for (var featureId in this.featureChangeKeys_) { for (var featureId in this.featureChangeKeys_) {
var keys = this.featureChangeKeys_[featureId]; var keys = this.featureChangeKeys_[featureId];
@@ -368,7 +368,7 @@ _ol_source_Vector_.prototype.clear = function(opt_fast) {
this.loadedExtentsRtree_.clear(); this.loadedExtentsRtree_.clear();
this.nullGeometryFeatures_ = {}; this.nullGeometryFeatures_ = {};
var clearEvent = new _ol_source_Vector_.Event(VectorEventType.CLEAR); var clearEvent = new VectorSource.Event(VectorEventType.CLEAR);
this.dispatchEvent(clearEvent); this.dispatchEvent(clearEvent);
this.changed(); this.changed();
}; };
@@ -385,7 +385,7 @@ _ol_source_Vector_.prototype.clear = function(opt_fast) {
* @template T * @template T
* @api * @api
*/ */
_ol_source_Vector_.prototype.forEachFeature = function(callback) { VectorSource.prototype.forEachFeature = function(callback) {
if (this.featuresRtree_) { if (this.featuresRtree_) {
return this.featuresRtree_.forEach(callback); return this.featuresRtree_.forEach(callback);
} else if (this.featuresCollection_) { } else if (this.featuresCollection_) {
@@ -406,7 +406,7 @@ _ol_source_Vector_.prototype.forEachFeature = function(callback) {
* @return {T|undefined} The return value from the last call to the callback. * @return {T|undefined} The return value from the last call to the callback.
* @template T * @template T
*/ */
_ol_source_Vector_.prototype.forEachFeatureAtCoordinateDirect = function(coordinate, callback) { VectorSource.prototype.forEachFeatureAtCoordinateDirect = function(coordinate, callback) {
var extent = [coordinate[0], coordinate[1], coordinate[0], coordinate[1]]; var extent = [coordinate[0], coordinate[1], coordinate[0], coordinate[1]];
return this.forEachFeatureInExtent(extent, function(feature) { return this.forEachFeatureInExtent(extent, function(feature) {
var geometry = feature.getGeometry(); var geometry = feature.getGeometry();
@@ -439,7 +439,7 @@ _ol_source_Vector_.prototype.forEachFeatureAtCoordinateDirect = function(coordin
* @template T * @template T
* @api * @api
*/ */
_ol_source_Vector_.prototype.forEachFeatureInExtent = function(extent, callback) { VectorSource.prototype.forEachFeatureInExtent = function(extent, callback) {
if (this.featuresRtree_) { if (this.featuresRtree_) {
return this.featuresRtree_.forEachInExtent(extent, callback); return this.featuresRtree_.forEachInExtent(extent, callback);
} else if (this.featuresCollection_) { } else if (this.featuresCollection_) {
@@ -464,7 +464,7 @@ _ol_source_Vector_.prototype.forEachFeatureInExtent = function(extent, callback)
* @template T * @template T
* @api * @api
*/ */
_ol_source_Vector_.prototype.forEachFeatureIntersectingExtent = function(extent, callback) { VectorSource.prototype.forEachFeatureIntersectingExtent = function(extent, callback) {
return this.forEachFeatureInExtent(extent, return this.forEachFeatureInExtent(extent,
/** /**
* @param {ol.Feature} feature Feature. * @param {ol.Feature} feature Feature.
@@ -490,7 +490,7 @@ _ol_source_Vector_.prototype.forEachFeatureIntersectingExtent = function(extent,
* @return {ol.Collection.<ol.Feature>} The collection of features. * @return {ol.Collection.<ol.Feature>} The collection of features.
* @api * @api
*/ */
_ol_source_Vector_.prototype.getFeaturesCollection = function() { VectorSource.prototype.getFeaturesCollection = function() {
return this.featuresCollection_; return this.featuresCollection_;
}; };
@@ -500,7 +500,7 @@ _ol_source_Vector_.prototype.getFeaturesCollection = function() {
* @return {Array.<ol.Feature>} Features. * @return {Array.<ol.Feature>} Features.
* @api * @api
*/ */
_ol_source_Vector_.prototype.getFeatures = function() { VectorSource.prototype.getFeatures = function() {
var features; var features;
if (this.featuresCollection_) { if (this.featuresCollection_) {
features = this.featuresCollection_.getArray(); features = this.featuresCollection_.getArray();
@@ -520,7 +520,7 @@ _ol_source_Vector_.prototype.getFeatures = function() {
* @return {Array.<ol.Feature>} Features. * @return {Array.<ol.Feature>} Features.
* @api * @api
*/ */
_ol_source_Vector_.prototype.getFeaturesAtCoordinate = function(coordinate) { VectorSource.prototype.getFeaturesAtCoordinate = function(coordinate) {
var features = []; var features = [];
this.forEachFeatureAtCoordinateDirect(coordinate, function(feature) { this.forEachFeatureAtCoordinateDirect(coordinate, function(feature) {
features.push(feature); features.push(feature);
@@ -540,7 +540,7 @@ _ol_source_Vector_.prototype.getFeaturesAtCoordinate = function(coordinate) {
* @return {Array.<ol.Feature>} Features. * @return {Array.<ol.Feature>} Features.
* @api * @api
*/ */
_ol_source_Vector_.prototype.getFeaturesInExtent = function(extent) { VectorSource.prototype.getFeaturesInExtent = function(extent) {
return this.featuresRtree_.getInExtent(extent); return this.featuresRtree_.getInExtent(extent);
}; };
@@ -557,7 +557,7 @@ _ol_source_Vector_.prototype.getFeaturesInExtent = function(extent) {
* @return {ol.Feature} Closest feature. * @return {ol.Feature} Closest feature.
* @api * @api
*/ */
_ol_source_Vector_.prototype.getClosestFeatureToCoordinate = function(coordinate, opt_filter) { VectorSource.prototype.getClosestFeatureToCoordinate = function(coordinate, opt_filter) {
// Find the closest feature using branch and bound. We start searching an // Find the closest feature using branch and bound. We start searching an
// infinite extent, and find the distance from the first feature found. This // infinite extent, and find the distance from the first feature found. This
// becomes the closest feature. We then compute a smaller extent which any // becomes the closest feature. We then compute a smaller extent which any
@@ -610,7 +610,7 @@ _ol_source_Vector_.prototype.getClosestFeatureToCoordinate = function(coordinate
* @return {ol.Extent} Extent. * @return {ol.Extent} Extent.
* @api * @api
*/ */
_ol_source_Vector_.prototype.getExtent = function(opt_extent) { VectorSource.prototype.getExtent = function(opt_extent) {
return this.featuresRtree_.getExtent(opt_extent); return this.featuresRtree_.getExtent(opt_extent);
}; };
@@ -624,7 +624,7 @@ _ol_source_Vector_.prototype.getExtent = function(opt_extent) {
* @return {ol.Feature} The feature (or `null` if not found). * @return {ol.Feature} The feature (or `null` if not found).
* @api * @api
*/ */
_ol_source_Vector_.prototype.getFeatureById = function(id) { VectorSource.prototype.getFeatureById = function(id) {
var feature = this.idIndex_[id.toString()]; var feature = this.idIndex_[id.toString()];
return feature !== undefined ? feature : null; return feature !== undefined ? feature : null;
}; };
@@ -636,7 +636,7 @@ _ol_source_Vector_.prototype.getFeatureById = function(id) {
* @return {ol.format.Feature|undefined} The feature format. * @return {ol.format.Feature|undefined} The feature format.
* @api * @api
*/ */
_ol_source_Vector_.prototype.getFormat = function() { VectorSource.prototype.getFormat = function() {
return this.format_; return this.format_;
}; };
@@ -644,7 +644,7 @@ _ol_source_Vector_.prototype.getFormat = function() {
/** /**
* @return {boolean} The source can have overlapping geometries. * @return {boolean} The source can have overlapping geometries.
*/ */
_ol_source_Vector_.prototype.getOverlaps = function() { VectorSource.prototype.getOverlaps = function() {
return this.overlaps_; return this.overlaps_;
}; };
@@ -652,7 +652,7 @@ _ol_source_Vector_.prototype.getOverlaps = function() {
/** /**
* @override * @override
*/ */
_ol_source_Vector_.prototype.getResolutions = function() {}; VectorSource.prototype.getResolutions = function() {};
/** /**
@@ -661,7 +661,7 @@ _ol_source_Vector_.prototype.getResolutions = function() {};
* @return {string|ol.FeatureUrlFunction|undefined} The url. * @return {string|ol.FeatureUrlFunction|undefined} The url.
* @api * @api
*/ */
_ol_source_Vector_.prototype.getUrl = function() { VectorSource.prototype.getUrl = function() {
return this.url_; return this.url_;
}; };
@@ -670,7 +670,7 @@ _ol_source_Vector_.prototype.getUrl = function() {
* @param {ol.events.Event} event Event. * @param {ol.events.Event} event Event.
* @private * @private
*/ */
_ol_source_Vector_.prototype.handleFeatureChange_ = function(event) { VectorSource.prototype.handleFeatureChange_ = function(event) {
var feature = /** @type {ol.Feature} */ (event.target); var feature = /** @type {ol.Feature} */ (event.target);
var featureKey = getUid(feature).toString(); var featureKey = getUid(feature).toString();
var geometry = feature.getGeometry(); var geometry = feature.getGeometry();
@@ -713,7 +713,7 @@ _ol_source_Vector_.prototype.handleFeatureChange_ = function(event) {
} }
} }
this.changed(); this.changed();
this.dispatchEvent(new _ol_source_Vector_.Event( this.dispatchEvent(new VectorSource.Event(
VectorEventType.CHANGEFEATURE, feature)); VectorEventType.CHANGEFEATURE, feature));
}; };
@@ -721,7 +721,7 @@ _ol_source_Vector_.prototype.handleFeatureChange_ = function(event) {
/** /**
* @return {boolean} Is empty. * @return {boolean} Is empty.
*/ */
_ol_source_Vector_.prototype.isEmpty = function() { VectorSource.prototype.isEmpty = function() {
return this.featuresRtree_.isEmpty() && return this.featuresRtree_.isEmpty() &&
_ol_obj_.isEmpty(this.nullGeometryFeatures_); _ol_obj_.isEmpty(this.nullGeometryFeatures_);
}; };
@@ -732,7 +732,7 @@ _ol_source_Vector_.prototype.isEmpty = function() {
* @param {number} resolution Resolution. * @param {number} resolution Resolution.
* @param {ol.proj.Projection} projection Projection. * @param {ol.proj.Projection} projection Projection.
*/ */
_ol_source_Vector_.prototype.loadFeatures = function( VectorSource.prototype.loadFeatures = function(
extent, resolution, projection) { extent, resolution, projection) {
var loadedExtentsRtree = this.loadedExtentsRtree_; var loadedExtentsRtree = this.loadedExtentsRtree_;
var extentsToLoad = this.strategy_(extent, resolution); var extentsToLoad = this.strategy_(extent, resolution);
@@ -760,7 +760,7 @@ _ol_source_Vector_.prototype.loadFeatures = function(
* @param {ol.Extent} extent Extent. * @param {ol.Extent} extent Extent.
* @api * @api
*/ */
_ol_source_Vector_.prototype.removeLoadedExtent = function(extent) { VectorSource.prototype.removeLoadedExtent = function(extent) {
var loadedExtentsRtree = this.loadedExtentsRtree_; var loadedExtentsRtree = this.loadedExtentsRtree_;
var obj; var obj;
loadedExtentsRtree.forEachInExtent(extent, function(object) { loadedExtentsRtree.forEachInExtent(extent, function(object) {
@@ -782,7 +782,7 @@ _ol_source_Vector_.prototype.removeLoadedExtent = function(extent) {
* @param {ol.Feature} feature Feature to remove. * @param {ol.Feature} feature Feature to remove.
* @api * @api
*/ */
_ol_source_Vector_.prototype.removeFeature = function(feature) { VectorSource.prototype.removeFeature = function(feature) {
var featureKey = getUid(feature).toString(); var featureKey = getUid(feature).toString();
if (featureKey in this.nullGeometryFeatures_) { if (featureKey in this.nullGeometryFeatures_) {
delete this.nullGeometryFeatures_[featureKey]; delete this.nullGeometryFeatures_[featureKey];
@@ -801,7 +801,7 @@ _ol_source_Vector_.prototype.removeFeature = function(feature) {
* @param {ol.Feature} feature Feature. * @param {ol.Feature} feature Feature.
* @protected * @protected
*/ */
_ol_source_Vector_.prototype.removeFeatureInternal = function(feature) { VectorSource.prototype.removeFeatureInternal = function(feature) {
var featureKey = getUid(feature).toString(); var featureKey = getUid(feature).toString();
this.featureChangeKeys_[featureKey].forEach(_ol_events_.unlistenByKey); this.featureChangeKeys_[featureKey].forEach(_ol_events_.unlistenByKey);
delete this.featureChangeKeys_[featureKey]; delete this.featureChangeKeys_[featureKey];
@@ -811,7 +811,7 @@ _ol_source_Vector_.prototype.removeFeatureInternal = function(feature) {
} else { } else {
delete this.undefIdIndex_[featureKey]; delete this.undefIdIndex_[featureKey];
} }
this.dispatchEvent(new _ol_source_Vector_.Event( this.dispatchEvent(new VectorSource.Event(
VectorEventType.REMOVEFEATURE, feature)); VectorEventType.REMOVEFEATURE, feature));
}; };
@@ -823,7 +823,7 @@ _ol_source_Vector_.prototype.removeFeatureInternal = function(feature) {
* @return {boolean} Removed the feature from the index. * @return {boolean} Removed the feature from the index.
* @private * @private
*/ */
_ol_source_Vector_.prototype.removeFromIdIndex_ = function(feature) { VectorSource.prototype.removeFromIdIndex_ = function(feature) {
var removed = false; var removed = false;
for (var id in this.idIndex_) { for (var id in this.idIndex_) {
if (this.idIndex_[id] === feature) { if (this.idIndex_[id] === feature) {
@@ -842,7 +842,7 @@ _ol_source_Vector_.prototype.removeFromIdIndex_ = function(feature) {
* @param {ol.FeatureLoader} loader The loader to set. * @param {ol.FeatureLoader} loader The loader to set.
* @api * @api
*/ */
_ol_source_Vector_.prototype.setLoader = function(loader) { VectorSource.prototype.setLoader = function(loader) {
this.loader_ = loader; this.loader_ = loader;
}; };
@@ -858,7 +858,7 @@ _ol_source_Vector_.prototype.setLoader = function(loader) {
* @param {string} type Type. * @param {string} type Type.
* @param {ol.Feature=} opt_feature Feature. * @param {ol.Feature=} opt_feature Feature.
*/ */
_ol_source_Vector_.Event = function(type, opt_feature) { VectorSource.Event = function(type, opt_feature) {
Event.call(this, type); Event.call(this, type);
@@ -870,5 +870,5 @@ _ol_source_Vector_.Event = function(type, opt_feature) {
this.feature = opt_feature; this.feature = opt_feature;
}; };
inherits(_ol_source_Vector_.Event, Event); inherits(VectorSource.Event, Event);
export default _ol_source_Vector_; export default VectorSource;

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

@@ -7,7 +7,7 @@ import LineString from '../../../../src/ol/geom/LineString.js';
import Point from '../../../../src/ol/geom/Point.js'; import Point from '../../../../src/ol/geom/Point.js';
import Polygon from '../../../../src/ol/geom/Polygon.js'; import Polygon from '../../../../src/ol/geom/Polygon.js';
import VectorLayer from '../../../../src/ol/layer/Vector.js'; import VectorLayer from '../../../../src/ol/layer/Vector.js';
import _ol_source_Vector_ from '../../../../src/ol/source/Vector.js'; import VectorSource from '../../../../src/ol/source/Vector.js';
import _ol_style_Circle_ from '../../../../src/ol/style/Circle.js'; import _ol_style_Circle_ from '../../../../src/ol/style/Circle.js';
import _ol_style_Fill_ from '../../../../src/ol/style/Fill.js'; import _ol_style_Fill_ from '../../../../src/ol/style/Fill.js';
import _ol_style_Stroke_ from '../../../../src/ol/style/Stroke.js'; import _ol_style_Stroke_ from '../../../../src/ol/style/Stroke.js';
@@ -70,7 +70,7 @@ describe('ol.rendering.layer.Vector', function() {
describe('vector layer', function() { describe('vector layer', function() {
beforeEach(function() { beforeEach(function() {
source = new _ol_source_Vector_(); source = new VectorSource();
}); });
it('renders opacity correctly with the canvas renderer', function(done) { it('renders opacity correctly with the canvas renderer', function(done) {
@@ -274,7 +274,7 @@ describe('ol.rendering.layer.Vector', function() {
it('renders fill/stroke batches correctly with the canvas renderer', function(done) { it('renders fill/stroke batches correctly with the canvas renderer', function(done) {
createMap('canvas'); createMap('canvas');
source = new _ol_source_Vector_({ source = new VectorSource({
overlaps: false overlaps: false
}); });
addPolygon(100); addPolygon(100);
@@ -300,7 +300,7 @@ describe('ol.rendering.layer.Vector', function() {
it('renders stroke batches correctly with the canvas renderer', function(done) { it('renders stroke batches correctly with the canvas renderer', function(done) {
createMap('canvas'); createMap('canvas');
source = new _ol_source_Vector_({ source = new VectorSource({
overlaps: false overlaps: false
}); });
addLineString(100); addLineString(100);
@@ -327,7 +327,7 @@ describe('ol.rendering.layer.Vector', function() {
var color; var color;
function createSource(overlaps) { function createSource(overlaps) {
color = '#3399CC'; color = '#3399CC';
source = new _ol_source_Vector_({ source = new VectorSource({
overlaps: overlaps overlaps: overlaps
}); });
addPolygon(720); addPolygon(720);
@@ -380,7 +380,7 @@ describe('ol.rendering.layer.Vector', function() {
var color; var color;
function createSource(overlaps) { function createSource(overlaps) {
color = '#3399CC'; color = '#3399CC';
source = new _ol_source_Vector_({ source = new VectorSource({
overlaps: overlaps overlaps: overlaps
}); });
addLineString(720); addLineString(720);
@@ -467,7 +467,7 @@ describe('ol.rendering.layer.Vector', function() {
var feature = format.readFeature(json); var feature = format.readFeature(json);
var layer = new VectorLayer({ var layer = new VectorLayer({
source: new _ol_source_Vector_({ source: new VectorSource({
features: [feature] features: [feature]
}), }),
style: new _ol_style_Style_({ style: new _ol_style_Style_({
@@ -492,7 +492,7 @@ describe('ol.rendering.layer.Vector', function() {
var layer, map3; var layer, map3;
beforeEach(function() { beforeEach(function() {
var src = new _ol_source_Vector_({ var src = new VectorSource({
features: [ features: [
new Feature(new Polygon([[ new Feature(new Polygon([[
[-22, 58], [-22, 58],
@@ -579,7 +579,7 @@ describe('ol.rendering.layer.Vector', function() {
describe('decluttering', function() { describe('decluttering', function() {
beforeEach(function() { beforeEach(function() {
source = new _ol_source_Vector_(); source = new VectorSource();
}); });
it('declutters text', function(done) { it('declutters text', function(done) {

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

@@ -6,7 +6,7 @@ import Point from '../../../../src/ol/geom/Point.js';
import VectorLayer from '../../../../src/ol/layer/Vector.js'; import VectorLayer from '../../../../src/ol/layer/Vector.js';
import _ol_layer_VectorTile_ from '../../../../src/ol/layer/VectorTile.js'; import _ol_layer_VectorTile_ from '../../../../src/ol/layer/VectorTile.js';
import _ol_obj_ from '../../../../src/ol/obj.js'; import _ol_obj_ from '../../../../src/ol/obj.js';
import _ol_source_Vector_ from '../../../../src/ol/source/Vector.js'; import VectorSource from '../../../../src/ol/source/Vector.js';
import _ol_source_VectorTile_ from '../../../../src/ol/source/VectorTile.js'; import _ol_source_VectorTile_ from '../../../../src/ol/source/VectorTile.js';
import _ol_style_Circle_ from '../../../../src/ol/style/Circle.js'; import _ol_style_Circle_ from '../../../../src/ol/style/Circle.js';
import _ol_style_Fill_ from '../../../../src/ol/style/Fill.js'; import _ol_style_Fill_ from '../../../../src/ol/style/Fill.js';
@@ -96,7 +96,7 @@ describe('ol.rendering.layer.VectorTile', function() {
it('renders rotated view correctly with vector layer on top', function(done) { it('renders rotated view correctly with vector layer on top', function(done) {
createMap('canvas'); createMap('canvas');
var vectorSource = new _ol_source_Vector_({ var vectorSource = new VectorSource({
features: [ features: [
new Feature(new Point([1825727.7316762917, 6143091.089223046])) new Feature(new Point([1825727.7316762917, 6143091.089223046]))
] ]

4
test/rendering/ol/map.test.js
View File

@@ -3,7 +3,7 @@ import Point from '../../../src/ol/geom/Point.js';
import Map from '../../../src/ol/Map.js'; import Map from '../../../src/ol/Map.js';
import View from '../../../src/ol/View.js'; import View from '../../../src/ol/View.js';
import VectorLayer from '../../../src/ol/layer/Vector.js'; import VectorLayer from '../../../src/ol/layer/Vector.js';
import _ol_source_Vector_ from '../../../src/ol/source/Vector.js'; import VectorSource from '../../../src/ol/source/Vector.js';
describe('ol.rendering.Map', function() { describe('ol.rendering.Map', function() {
@@ -11,7 +11,7 @@ describe('ol.rendering.Map', function() {
var map; var map;
function createMap(renderer) { function createMap(renderer) {
var vectorLayer = new VectorLayer({ var vectorLayer = new VectorLayer({
source: new _ol_source_Vector_({ source: new VectorSource({
features: [new Feature({ features: [new Feature({
geometry: new Point([0, 0]) geometry: new Point([0, 0])
})] })]

4
test/rendering/ol/style/circle.test.js
View File

@@ -4,7 +4,7 @@ import MultiPoint from '../../../../src/ol/geom/MultiPoint.js';
import Map from '../../../../src/ol/Map.js'; import Map from '../../../../src/ol/Map.js';
import View from '../../../../src/ol/View.js'; import View from '../../../../src/ol/View.js';
import VectorLayer from '../../../../src/ol/layer/Vector.js'; import VectorLayer from '../../../../src/ol/layer/Vector.js';
import _ol_source_Vector_ from '../../../../src/ol/source/Vector.js'; import VectorSource from '../../../../src/ol/source/Vector.js';
import _ol_style_Circle_ from '../../../../src/ol/style/Circle.js'; import _ol_style_Circle_ from '../../../../src/ol/style/Circle.js';
import _ol_style_Fill_ from '../../../../src/ol/style/Fill.js'; import _ol_style_Fill_ from '../../../../src/ol/style/Fill.js';
import _ol_style_Style_ from '../../../../src/ol/style/Style.js'; import _ol_style_Style_ from '../../../../src/ol/style/Style.js';
@@ -16,7 +16,7 @@ describe('ol.rendering.style.Circle', function() {
var map, vectorSource; var map, vectorSource;
function createMap(renderer) { function createMap(renderer) {
vectorSource = new _ol_source_Vector_(); vectorSource = new VectorSource();
var vectorLayer = new VectorLayer({ var vectorLayer = new VectorLayer({
source: vectorSource source: vectorSource
}); });

4
test/rendering/ol/style/icon.test.js
View File

@@ -3,7 +3,7 @@ import Point from '../../../../src/ol/geom/Point.js';
import Map from '../../../../src/ol/Map.js'; import Map from '../../../../src/ol/Map.js';
import View from '../../../../src/ol/View.js'; import View from '../../../../src/ol/View.js';
import VectorLayer from '../../../../src/ol/layer/Vector.js'; import VectorLayer from '../../../../src/ol/layer/Vector.js';
import _ol_source_Vector_ from '../../../../src/ol/source/Vector.js'; import VectorSource from '../../../../src/ol/source/Vector.js';
import _ol_style_Icon_ from '../../../../src/ol/style/Icon.js'; import _ol_style_Icon_ from '../../../../src/ol/style/Icon.js';
import _ol_style_Style_ from '../../../../src/ol/style/Style.js'; import _ol_style_Style_ from '../../../../src/ol/style/Style.js';
@@ -22,7 +22,7 @@ describe('ol.rendering.style.Icon', function() {
}; };
function createMap(renderer, width, height) { function createMap(renderer, width, height) {
vectorSource = new _ol_source_Vector_(); vectorSource = new VectorSource();
var vectorLayer = new VectorLayer({ var vectorLayer = new VectorLayer({
source: vectorSource source: vectorSource
}); });

4
test/rendering/ol/style/linestring.test.js
View File

@@ -3,7 +3,7 @@ import LineString from '../../../../src/ol/geom/LineString.js';
import Map from '../../../../src/ol/Map.js'; import Map from '../../../../src/ol/Map.js';
import View from '../../../../src/ol/View.js'; import View from '../../../../src/ol/View.js';
import VectorLayer from '../../../../src/ol/layer/Vector.js'; import VectorLayer from '../../../../src/ol/layer/Vector.js';
import _ol_source_Vector_ from '../../../../src/ol/source/Vector.js'; import VectorSource from '../../../../src/ol/source/Vector.js';
import _ol_style_Style_ from '../../../../src/ol/style/Style.js'; import _ol_style_Style_ from '../../../../src/ol/style/Style.js';
import _ol_style_Stroke_ from '../../../../src/ol/style/Stroke.js'; import _ol_style_Stroke_ from '../../../../src/ol/style/Stroke.js';
@@ -13,7 +13,7 @@ describe('ol.rendering.style.LineString', function() {
var map, vectorSource; var map, vectorSource;
function createMap(renderer, opt_pixelRatio) { function createMap(renderer, opt_pixelRatio) {
vectorSource = new _ol_source_Vector_(); vectorSource = new VectorSource();
var vectorLayer = new VectorLayer({ var vectorLayer = new VectorLayer({
source: vectorSource source: vectorSource
}); });

4
test/rendering/ol/style/polygon.test.js
View File

@@ -3,7 +3,7 @@ import Polygon from '../../../../src/ol/geom/Polygon.js';
import Map from '../../../../src/ol/Map.js'; import Map from '../../../../src/ol/Map.js';
import View from '../../../../src/ol/View.js'; import View from '../../../../src/ol/View.js';
import VectorLayer from '../../../../src/ol/layer/Vector.js'; import VectorLayer from '../../../../src/ol/layer/Vector.js';
import _ol_source_Vector_ from '../../../../src/ol/source/Vector.js'; import VectorSource from '../../../../src/ol/source/Vector.js';
import _ol_style_Fill_ from '../../../../src/ol/style/Fill.js'; import _ol_style_Fill_ from '../../../../src/ol/style/Fill.js';
import _ol_style_Style_ from '../../../../src/ol/style/Style.js'; import _ol_style_Style_ from '../../../../src/ol/style/Style.js';
import _ol_style_Stroke_ from '../../../../src/ol/style/Stroke.js'; import _ol_style_Stroke_ from '../../../../src/ol/style/Stroke.js';
@@ -16,7 +16,7 @@ describe('ol.rendering.style.Polygon', function() {
function createMap(renderer, opt_size) { function createMap(renderer, opt_size) {
var size = opt_size || 50; var size = opt_size || 50;
vectorSource = new _ol_source_Vector_(); vectorSource = new VectorSource();
var vectorLayer = new VectorLayer({ var vectorLayer = new VectorLayer({
source: vectorSource source: vectorSource
}); });

4
test/rendering/ol/style/regularshape.test.js
View File

@@ -3,7 +3,7 @@ import Point from '../../../../src/ol/geom/Point.js';
import Map from '../../../../src/ol/Map.js'; import Map from '../../../../src/ol/Map.js';
import View from '../../../../src/ol/View.js'; import View from '../../../../src/ol/View.js';
import VectorLayer from '../../../../src/ol/layer/Vector.js'; import VectorLayer from '../../../../src/ol/layer/Vector.js';
import _ol_source_Vector_ from '../../../../src/ol/source/Vector.js'; import VectorSource from '../../../../src/ol/source/Vector.js';
import _ol_style_Fill_ from '../../../../src/ol/style/Fill.js'; import _ol_style_Fill_ from '../../../../src/ol/style/Fill.js';
import _ol_style_RegularShape_ from '../../../../src/ol/style/RegularShape.js'; import _ol_style_RegularShape_ from '../../../../src/ol/style/RegularShape.js';
import _ol_style_Style_ from '../../../../src/ol/style/Style.js'; import _ol_style_Style_ from '../../../../src/ol/style/Style.js';
@@ -15,7 +15,7 @@ describe('ol.rendering.style.RegularShape', function() {
var map, vectorSource; var map, vectorSource;
function createMap(renderer) { function createMap(renderer) {
vectorSource = new _ol_source_Vector_(); vectorSource = new VectorSource();
var vectorLayer = new VectorLayer({ var vectorLayer = new VectorLayer({
source: vectorSource source: vectorSource
}); });

4
test/rendering/ol/style/text.test.js
View File

@@ -7,7 +7,7 @@ import Polygon from '../../../../src/ol/geom/Polygon.js';
import Map from '../../../../src/ol/Map.js'; import Map from '../../../../src/ol/Map.js';
import View from '../../../../src/ol/View.js'; import View from '../../../../src/ol/View.js';
import VectorLayer from '../../../../src/ol/layer/Vector.js'; import VectorLayer from '../../../../src/ol/layer/Vector.js';
import _ol_source_Vector_ from '../../../../src/ol/source/Vector.js'; import VectorSource from '../../../../src/ol/source/Vector.js';
import _ol_style_Text_ from '../../../../src/ol/style/Text.js'; import _ol_style_Text_ from '../../../../src/ol/style/Text.js';
import _ol_style_Fill_ from '../../../../src/ol/style/Fill.js'; import _ol_style_Fill_ from '../../../../src/ol/style/Fill.js';
import _ol_style_Style_ from '../../../../src/ol/style/Style.js'; import _ol_style_Style_ from '../../../../src/ol/style/Style.js';
@@ -19,7 +19,7 @@ describe('ol.rendering.style.Text', function() {
function createMap(renderer, opt_pixelRatio) { function createMap(renderer, opt_pixelRatio) {
var pixelRatio = opt_pixelRatio || 1; var pixelRatio = opt_pixelRatio || 1;
vectorSource = new _ol_source_Vector_(); vectorSource = new VectorSource();
var vectorLayer = new VectorLayer({ var vectorLayer = new VectorLayer({
source: vectorSource source: vectorSource
}); });

4
test/spec/ol/featureloader.test.js
View File

@@ -1,6 +1,6 @@
import {xhr} from '../../../src/ol/featureloader.js'; import {xhr} from '../../../src/ol/featureloader.js';
import GeoJSON from '../../../src/ol/format/GeoJSON.js'; import GeoJSON from '../../../src/ol/format/GeoJSON.js';
import _ol_source_Vector_ from '../../../src/ol/source/Vector.js'; import VectorSource from '../../../src/ol/source/Vector.js';
describe('ol.featureloader', function() { describe('ol.featureloader', function() {
@@ -15,7 +15,7 @@ describe('ol.featureloader', function() {
url = 'spec/ol/data/point.json'; url = 'spec/ol/data/point.json';
format = new GeoJSON(); format = new GeoJSON();
source = new _ol_source_Vector_(); source = new VectorSource();
}); });
it('adds features to the source', function(done) { it('adds features to the source', function(done) {

6
test/spec/ol/interaction/draganddrop.test.js
View File

@@ -4,7 +4,7 @@ import Event from '../../../../src/ol/events/Event.js';
import EventTarget from '../../../../src/ol/events/EventTarget.js'; import EventTarget from '../../../../src/ol/events/EventTarget.js';
import GeoJSON from '../../../../src/ol/format/GeoJSON.js'; import GeoJSON from '../../../../src/ol/format/GeoJSON.js';
import DragAndDrop from '../../../../src/ol/interaction/DragAndDrop.js'; import DragAndDrop from '../../../../src/ol/interaction/DragAndDrop.js';
import _ol_source_Vector_ from '../../../../src/ol/source/Vector.js'; import VectorSource from '../../../../src/ol/source/Vector.js';
where('FileReader').describe('ol.interaction.DragAndDrop', function() { where('FileReader').describe('ol.interaction.DragAndDrop', function() {
var viewport, map, interaction; var viewport, map, interaction;
@@ -36,7 +36,7 @@ where('FileReader').describe('ol.interaction.DragAndDrop', function() {
}); });
it('accepts a source option', function() { it('accepts a source option', function() {
var source = new _ol_source_Vector_(); var source = new VectorSource();
var drop = new DragAndDrop({ var drop = new DragAndDrop({
formatConstructors: [GeoJSON], formatConstructors: [GeoJSON],
source: source source: source
@@ -136,7 +136,7 @@ where('FileReader').describe('ol.interaction.DragAndDrop', function() {
}); });
it('adds dropped features to a source', function(done) { it('adds dropped features to a source', function(done) {
var source = new _ol_source_Vector_(); var source = new VectorSource();
var drop = new DragAndDrop({ var drop = new DragAndDrop({
formatConstructors: [GeoJSON], formatConstructors: [GeoJSON],
source: source source: source

4
test/spec/ol/interaction/dragrotateandzoom.test.js
View File

@@ -5,7 +5,7 @@ import DragRotateAndZoom from '../../../../src/ol/interaction/DragRotateAndZoom.
import Interaction from '../../../../src/ol/interaction/Interaction.js'; import Interaction from '../../../../src/ol/interaction/Interaction.js';
import VectorLayer from '../../../../src/ol/layer/Vector.js'; import VectorLayer from '../../../../src/ol/layer/Vector.js';
import _ol_pointer_PointerEvent_ from '../../../../src/ol/pointer/PointerEvent.js'; import _ol_pointer_PointerEvent_ from '../../../../src/ol/pointer/PointerEvent.js';
import _ol_source_Vector_ from '../../../../src/ol/source/Vector.js'; import VectorSource from '../../../../src/ol/source/Vector.js';
describe('ol.interaction.DragRotateAndZoom', function() { describe('ol.interaction.DragRotateAndZoom', function() {
@@ -34,7 +34,7 @@ describe('ol.interaction.DragRotateAndZoom', function() {
style.width = width + 'px'; style.width = width + 'px';
style.height = height + 'px'; style.height = height + 'px';
document.body.appendChild(target); document.body.appendChild(target);
var source = new _ol_source_Vector_(); var source = new VectorSource();
var layer = new VectorLayer({source: source}); var layer = new VectorLayer({source: source});
interaction = new DragRotateAndZoom(); interaction = new DragRotateAndZoom();
map = new Map({ map = new Map({

4
test/spec/ol/interaction/dragzoom.test.js
View File

@@ -5,7 +5,7 @@ import {fromExtent as polygonFromExtent} from '../../../../src/ol/geom/Polygon.j
import DragZoom from '../../../../src/ol/interaction/DragZoom.js'; import DragZoom from '../../../../src/ol/interaction/DragZoom.js';
import VectorLayer from '../../../../src/ol/layer/Vector.js'; import VectorLayer from '../../../../src/ol/layer/Vector.js';
import _ol_render_Box_ from '../../../../src/ol/render/Box.js'; import _ol_render_Box_ from '../../../../src/ol/render/Box.js';
import _ol_source_Vector_ from '../../../../src/ol/source/Vector.js'; import VectorSource from '../../../../src/ol/source/Vector.js';
describe('ol.interaction.DragZoom', function() { describe('ol.interaction.DragZoom', function() {
@@ -24,7 +24,7 @@ describe('ol.interaction.DragZoom', function() {
style.width = width + 'px'; style.width = width + 'px';
style.height = height + 'px'; style.height = height + 'px';
document.body.appendChild(target); document.body.appendChild(target);
source = new _ol_source_Vector_(); source = new VectorSource();
var layer = new VectorLayer({source: source}); var layer = new VectorLayer({source: source});
map = new Map({ map = new Map({
target: target, target: target,

4
test/spec/ol/interaction/draw.test.js
View File

@@ -16,7 +16,7 @@ import Draw from '../../../../src/ol/interaction/Draw.js';
import Interaction from '../../../../src/ol/interaction/Interaction.js'; import Interaction from '../../../../src/ol/interaction/Interaction.js';
import VectorLayer from '../../../../src/ol/layer/Vector.js'; import VectorLayer from '../../../../src/ol/layer/Vector.js';
import _ol_pointer_PointerEvent_ from '../../../../src/ol/pointer/PointerEvent.js'; import _ol_pointer_PointerEvent_ from '../../../../src/ol/pointer/PointerEvent.js';
import _ol_source_Vector_ from '../../../../src/ol/source/Vector.js'; import VectorSource from '../../../../src/ol/source/Vector.js';
describe('ol.interaction.Draw', function() { describe('ol.interaction.Draw', function() {
@@ -34,7 +34,7 @@ describe('ol.interaction.Draw', function() {
style.width = width + 'px'; style.width = width + 'px';
style.height = height + 'px'; style.height = height + 'px';
document.body.appendChild(target); document.body.appendChild(target);
source = new _ol_source_Vector_(); source = new VectorSource();
var layer = new VectorLayer({source: source}); var layer = new VectorLayer({source: source});
map = new Map({ map = new Map({
target: target, target: target,

6
test/spec/ol/interaction/modify.test.js
View File

@@ -12,7 +12,7 @@ import Polygon from '../../../../src/ol/geom/Polygon.js';
import _ol_interaction_Modify_ from '../../../../src/ol/interaction/Modify.js'; import _ol_interaction_Modify_ from '../../../../src/ol/interaction/Modify.js';
import VectorLayer from '../../../../src/ol/layer/Vector.js'; import VectorLayer from '../../../../src/ol/layer/Vector.js';
import _ol_pointer_PointerEvent_ from '../../../../src/ol/pointer/PointerEvent.js'; import _ol_pointer_PointerEvent_ from '../../../../src/ol/pointer/PointerEvent.js';
import _ol_source_Vector_ from '../../../../src/ol/source/Vector.js'; import VectorSource from '../../../../src/ol/source/Vector.js';
describe('ol.interaction.Modify', function() { describe('ol.interaction.Modify', function() {
@@ -41,7 +41,7 @@ describe('ol.interaction.Modify', function() {
}) })
]; ];
source = new _ol_source_Vector_({ source = new VectorSource({
features: features features: features
}); });
@@ -180,7 +180,7 @@ describe('ol.interaction.Modify', function() {
it('accepts a source', function() { it('accepts a source', function() {
var feature = new Feature( var feature = new Feature(
new Point([0, 0])); new Point([0, 0]));
var source = new _ol_source_Vector_({features: [feature]}); var source = new VectorSource({features: [feature]});
var modify = new _ol_interaction_Modify_({source: source}); var modify = new _ol_interaction_Modify_({source: source});
var rbushEntries = modify.rBush_.getAll(); var rbushEntries = modify.rBush_.getAll();
expect(rbushEntries.length).to.be(1); expect(rbushEntries.length).to.be(1);

4
test/spec/ol/interaction/select.test.js
View File

@@ -9,7 +9,7 @@ import Interaction from '../../../../src/ol/interaction/Interaction.js';
import _ol_interaction_Select_ from '../../../../src/ol/interaction/Select.js'; import _ol_interaction_Select_ from '../../../../src/ol/interaction/Select.js';
import VectorLayer from '../../../../src/ol/layer/Vector.js'; import VectorLayer from '../../../../src/ol/layer/Vector.js';
import _ol_pointer_PointerEvent_ from '../../../../src/ol/pointer/PointerEvent.js'; import _ol_pointer_PointerEvent_ from '../../../../src/ol/pointer/PointerEvent.js';
import _ol_source_Vector_ from '../../../../src/ol/source/Vector.js'; import VectorSource from '../../../../src/ol/source/Vector.js';
describe('ol.interaction.Select', function() { describe('ol.interaction.Select', function() {
@@ -53,7 +53,7 @@ describe('ol.interaction.Select', function() {
type: 'foo' type: 'foo'
})); }));
source = new _ol_source_Vector_({ source = new VectorSource({
features: features features: features
}); });

4
test/spec/ol/interaction/translate.test.js
View File

@@ -8,7 +8,7 @@ import _ol_interaction_Translate_ from '../../../../src/ol/interaction/Translate
import Interaction from '../../../../src/ol/interaction/Interaction.js'; import Interaction from '../../../../src/ol/interaction/Interaction.js';
import VectorLayer from '../../../../src/ol/layer/Vector.js'; import VectorLayer from '../../../../src/ol/layer/Vector.js';
import _ol_pointer_PointerEvent_ from '../../../../src/ol/pointer/PointerEvent.js'; import _ol_pointer_PointerEvent_ from '../../../../src/ol/pointer/PointerEvent.js';
import _ol_source_Vector_ from '../../../../src/ol/source/Vector.js'; import VectorSource from '../../../../src/ol/source/Vector.js';
describe('ol.interaction.Translate', function() { describe('ol.interaction.Translate', function() {
@@ -26,7 +26,7 @@ describe('ol.interaction.Translate', function() {
style.width = width + 'px'; style.width = width + 'px';
style.height = height + 'px'; style.height = height + 'px';
document.body.appendChild(target); document.body.appendChild(target);
source = new _ol_source_Vector_(); source = new VectorSource();
features = [new Feature({ features = [new Feature({
geometry: new Point([10, -20]) geometry: new Point([10, -20])
}), new Feature({ }), new Feature({

8
test/spec/ol/layer/vector.test.js
View File

@@ -1,13 +1,13 @@
import _ol_layer_Layer_ from '../../../../src/ol/layer/Layer.js'; import _ol_layer_Layer_ from '../../../../src/ol/layer/Layer.js';
import VectorLayer from '../../../../src/ol/layer/Vector.js'; import VectorLayer from '../../../../src/ol/layer/Vector.js';
import _ol_source_Vector_ from '../../../../src/ol/source/Vector.js'; import VectorSource from '../../../../src/ol/source/Vector.js';
import _ol_style_Style_ from '../../../../src/ol/style/Style.js'; import _ol_style_Style_ from '../../../../src/ol/style/Style.js';
describe('ol.layer.Vector', function() { describe('ol.layer.Vector', function() {
describe('constructor', function() { describe('constructor', function() {
var source = new _ol_source_Vector_(); var source = new VectorSource();
var style = new _ol_style_Style_(); var style = new _ol_style_Style_();
it('creates a new layer', function() { it('creates a new layer', function() {
@@ -56,7 +56,7 @@ describe('ol.layer.Vector', function() {
beforeEach(function() { beforeEach(function() {
layer = new VectorLayer({ layer = new VectorLayer({
source: new _ol_source_Vector_() source: new VectorSource()
}); });
style = new _ol_style_Style_(); style = new _ol_style_Style_();
}); });
@@ -97,7 +97,7 @@ describe('ol.layer.Vector', function() {
describe('#getStyle()', function() { describe('#getStyle()', function() {
var source = new _ol_source_Vector_(); var source = new VectorSource();
var style = new _ol_style_Style_(); var style = new _ol_style_Style_();
it('returns what is provided to setStyle', function() { it('returns what is provided to setStyle', function() {

6
test/spec/ol/map.test.js
View File

@@ -13,7 +13,7 @@ import _ol_interaction_PinchZoom_ from '../../../src/ol/interaction/PinchZoom.js
import TileLayer from '../../../src/ol/layer/Tile.js'; import TileLayer from '../../../src/ol/layer/Tile.js';
import VectorLayer from '../../../src/ol/layer/Vector.js'; import VectorLayer from '../../../src/ol/layer/Vector.js';
import _ol_renderer_canvas_IntermediateCanvas_ from '../../../src/ol/renderer/canvas/IntermediateCanvas.js'; import _ol_renderer_canvas_IntermediateCanvas_ from '../../../src/ol/renderer/canvas/IntermediateCanvas.js';
import _ol_source_Vector_ from '../../../src/ol/source/Vector.js'; import VectorSource from '../../../src/ol/source/Vector.js';
import _ol_source_XYZ_ from '../../../src/ol/source/XYZ.js'; import _ol_source_XYZ_ from '../../../src/ol/source/XYZ.js';
describe('ol.Map', function() { describe('ol.Map', function() {
@@ -196,7 +196,7 @@ describe('ol.Map', function() {
map = new Map({ map = new Map({
target: target, target: target,
layers: [new VectorLayer({ layers: [new VectorLayer({
source: new _ol_source_Vector_({ source: new VectorSource({
features: [new Feature(new LineString([[-50, 0], [50, 0]]))] features: [new Feature(new LineString([[-50, 0], [50, 0]]))]
}) })
})], })],
@@ -238,7 +238,7 @@ describe('ol.Map', function() {
it('respects options', function() { it('respects options', function() {
var otherLayer = new VectorLayer({ var otherLayer = new VectorLayer({
source: new _ol_source_Vector_ source: new VectorSource
}); });
map.addLayer(otherLayer); map.addLayer(otherLayer);
var features = map.getFeaturesAtPixel([50, 50], { var features = map.getFeaturesAtPixel([50, 50], {

8
test/spec/ol/renderer/canvas/map.test.js
View File

@@ -7,7 +7,7 @@ import TileLayer from '../../../../../src/ol/layer/Tile.js';
import VectorLayer from '../../../../../src/ol/layer/Vector.js'; import VectorLayer from '../../../../../src/ol/layer/Vector.js';
import _ol_renderer_canvas_Layer_ from '../../../../../src/ol/renderer/canvas/Layer.js'; import _ol_renderer_canvas_Layer_ from '../../../../../src/ol/renderer/canvas/Layer.js';
import CanvasMapRenderer from '../../../../../src/ol/renderer/canvas/Map.js'; import CanvasMapRenderer from '../../../../../src/ol/renderer/canvas/Map.js';
import _ol_source_Vector_ from '../../../../../src/ol/source/Vector.js'; import VectorSource from '../../../../../src/ol/source/Vector.js';
import _ol_style_Icon_ from '../../../../../src/ol/style/Icon.js'; import _ol_style_Icon_ from '../../../../../src/ol/style/Icon.js';
import _ol_style_Style_ from '../../../../../src/ol/style/Style.js'; import _ol_style_Style_ from '../../../../../src/ol/style/Style.js';
@@ -51,7 +51,7 @@ describe('ol.renderer.canvas.Map', function() {
img.src = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAAAAAA6fptVAAAACklEQVR4nGNiAAAABgADNjd8qAAAAABJRU5ErkJggg=='; img.src = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAAAAAA6fptVAAAACklEQVR4nGNiAAAABgADNjd8qAAAAABJRU5ErkJggg==';
layer = new VectorLayer({ layer = new VectorLayer({
source: new _ol_source_Vector_({ source: new VectorSource({
features: [ features: [
new Feature({ new Feature({
geometry: new Point([0, 0]) geometry: new Point([0, 0])
@@ -93,7 +93,7 @@ describe('ol.renderer.canvas.Map', function() {
it('calls callback with main layer when skipped feature on unmanaged layer', function() { it('calls callback with main layer when skipped feature on unmanaged layer', function() {
var feature = layer.getSource().getFeatures()[0]; var feature = layer.getSource().getFeatures()[0];
var managedLayer = new VectorLayer({ var managedLayer = new VectorLayer({
source: new _ol_source_Vector_({ source: new VectorSource({
features: [feature] features: [feature]
}) })
}); });
@@ -170,7 +170,7 @@ describe('ol.renderer.canvas.Map', function() {
map = new Map({}); map = new Map({});
map.on('postcompose', function() {}); map.on('postcompose', function() {});
layer = new VectorLayer({ layer = new VectorLayer({
source: new _ol_source_Vector_({wrapX: true}) source: new VectorSource({wrapX: true})
}); });
renderer = map.getRenderer(); renderer = map.getRenderer();
renderer.layerRenderers_ = {}; renderer.layerRenderers_ = {};

16
test/spec/ol/renderer/canvas/vectorlayer.test.js
View File

@@ -9,7 +9,7 @@ import _ol_obj_ from '../../../../../src/ol/obj.js';
import {get as getProjection} from '../../../../../src/ol/proj.js'; import {get as getProjection} from '../../../../../src/ol/proj.js';
import _ol_render_canvas_ from '../../../../../src/ol/render/canvas.js'; import _ol_render_canvas_ from '../../../../../src/ol/render/canvas.js';
import CanvasVectorLayerRenderer from '../../../../../src/ol/renderer/canvas/VectorLayer.js'; import CanvasVectorLayerRenderer from '../../../../../src/ol/renderer/canvas/VectorLayer.js';
import _ol_source_Vector_ from '../../../../../src/ol/source/Vector.js'; import VectorSource from '../../../../../src/ol/source/Vector.js';
import _ol_style_Style_ from '../../../../../src/ol/style/Style.js'; import _ol_style_Style_ from '../../../../../src/ol/style/Style.js';
import _ol_style_Text_ from '../../../../../src/ol/style/Text.js'; import _ol_style_Text_ from '../../../../../src/ol/style/Text.js';
@@ -38,7 +38,7 @@ describe('ol.renderer.canvas.VectorLayer', function() {
it('creates a new instance', function() { it('creates a new instance', function() {
var layer = new VectorLayer({ var layer = new VectorLayer({
source: new _ol_source_Vector_() source: new VectorSource()
}); });
var renderer = new CanvasVectorLayerRenderer(layer); var renderer = new CanvasVectorLayerRenderer(layer);
expect(renderer).to.be.a(CanvasVectorLayerRenderer); expect(renderer).to.be.a(CanvasVectorLayerRenderer);
@@ -70,7 +70,7 @@ describe('ol.renderer.canvas.VectorLayer', function() {
var feature2 = new Feature(new Point([0, 0])); var feature2 = new Feature(new Point([0, 0]));
feature2.setStyle(featureStyle); feature2.setStyle(featureStyle);
var layer = new VectorLayer({ var layer = new VectorLayer({
source: new _ol_source_Vector_({ source: new VectorSource({
features: [feature1, feature2] features: [feature1, feature2]
}), }),
style: layerStyle style: layerStyle
@@ -102,7 +102,7 @@ describe('ol.renderer.canvas.VectorLayer', function() {
var feature = new Feature(new Point([0, 0])); var feature = new Feature(new Point([0, 0]));
var layer = new VectorLayer({ var layer = new VectorLayer({
source: new _ol_source_Vector_({ source: new VectorSource({
features: [feature] features: [feature]
}), }),
style: layerStyle style: layerStyle
@@ -133,7 +133,7 @@ describe('ol.renderer.canvas.VectorLayer', function() {
var feature = new Feature(new Point([0, 0])); var feature = new Feature(new Point([0, 0]));
var layer = new VectorLayer({ var layer = new VectorLayer({
source: new _ol_source_Vector_({ source: new VectorSource({
features: [feature] features: [feature]
}), }),
style: layerStyle style: layerStyle
@@ -165,7 +165,7 @@ describe('ol.renderer.canvas.VectorLayer', function() {
var feature = new Feature(new Point([0, 0])); var feature = new Feature(new Point([0, 0]));
var layer = new VectorLayer({ var layer = new VectorLayer({
source: new _ol_source_Vector_({ source: new VectorSource({
features: [feature] features: [feature]
}), }),
style: layerStyle style: layerStyle
@@ -186,7 +186,7 @@ describe('ol.renderer.canvas.VectorLayer', function() {
beforeEach(function() { beforeEach(function() {
layer = new VectorLayer({ layer = new VectorLayer({
source: new _ol_source_Vector_() source: new VectorSource()
}); });
renderer = new CanvasVectorLayerRenderer(layer); renderer = new CanvasVectorLayerRenderer(layer);
var replayGroup = {}; var replayGroup = {};
@@ -223,7 +223,7 @@ describe('ol.renderer.canvas.VectorLayer', function() {
beforeEach(function() { beforeEach(function() {
var layer = new VectorLayer({ var layer = new VectorLayer({
source: new _ol_source_Vector_({wrapX: true}) source: new VectorSource({wrapX: true})
}); });
renderer = new CanvasVectorLayerRenderer(layer); renderer = new CanvasVectorLayerRenderer(layer);
var projection = getProjection('EPSG:3857'); var projection = getProjection('EPSG:3857');

10
test/spec/ol/source/cluster.test.js
View File

@@ -5,7 +5,7 @@ import Polygon from '../../../../src/ol/geom/Polygon.js';
import {get as getProjection} from '../../../../src/ol/proj.js'; import {get as getProjection} from '../../../../src/ol/proj.js';
import _ol_source_Cluster_ from '../../../../src/ol/source/Cluster.js'; import _ol_source_Cluster_ from '../../../../src/ol/source/Cluster.js';
import Source from '../../../../src/ol/source/Source.js'; import Source from '../../../../src/ol/source/Source.js';
import _ol_source_Vector_ from '../../../../src/ol/source/Vector.js'; import VectorSource from '../../../../src/ol/source/Vector.js';
describe('ol.source.Cluster', function() { describe('ol.source.Cluster', function() {
@@ -13,7 +13,7 @@ describe('ol.source.Cluster', function() {
it('returns a cluster source', function() { it('returns a cluster source', function() {
var source = new _ol_source_Cluster_({ var source = new _ol_source_Cluster_({
projection: getProjection('EPSG:4326'), projection: getProjection('EPSG:4326'),
source: new _ol_source_Vector_() source: new VectorSource()
}); });
expect(source).to.be.a(Source); expect(source).to.be.a(Source);
expect(source).to.be.a(_ol_source_Cluster_); expect(source).to.be.a(_ol_source_Cluster_);
@@ -26,7 +26,7 @@ describe('ol.source.Cluster', function() {
var projection = getProjection('EPSG:3857'); var projection = getProjection('EPSG:3857');
it('clusters a source with point features', function() { it('clusters a source with point features', function() {
var source = new _ol_source_Cluster_({ var source = new _ol_source_Cluster_({
source: new _ol_source_Vector_({ source: new VectorSource({
features: [ features: [
new Feature(new Point([0, 0])), new Feature(new Point([0, 0])),
new Feature(new Point([0, 0])) new Feature(new Point([0, 0]))
@@ -48,7 +48,7 @@ describe('ol.source.Cluster', function() {
} }
return null; return null;
}, },
source: new _ol_source_Vector_({ source: new VectorSource({
features: [ features: [
new Feature(new Point([0, 0])), new Feature(new Point([0, 0])),
new Feature(new LineString([[0, 0], [1, 1]])), new Feature(new LineString([[0, 0], [1, 1]])),
@@ -67,7 +67,7 @@ describe('ol.source.Cluster', function() {
it('changes the distance value', function() { it('changes the distance value', function() {
var source = new _ol_source_Cluster_({ var source = new _ol_source_Cluster_({
distance: 100, distance: 100,
source: new _ol_source_Vector_() source: new VectorSource()
}); });
expect(source.getDistance()).to.be(100); expect(source.getDistance()).to.be(100);
source.setDistance(10); source.setDistance(10);

32
test/spec/ol/source/vector.test.js
View File

@@ -8,7 +8,7 @@ import LineString from '../../../../src/ol/geom/LineString.js';
import VectorLayer from '../../../../src/ol/layer/Vector.js'; import VectorLayer from '../../../../src/ol/layer/Vector.js';
import _ol_loadingstrategy_ from '../../../../src/ol/loadingstrategy.js'; import _ol_loadingstrategy_ from '../../../../src/ol/loadingstrategy.js';
import {get as getProjection, transformExtent, fromLonLat} from '../../../../src/ol/proj.js'; import {get as getProjection, transformExtent, fromLonLat} from '../../../../src/ol/proj.js';
import _ol_source_Vector_ from '../../../../src/ol/source/Vector.js'; import VectorSource from '../../../../src/ol/source/Vector.js';
describe('ol.source.Vector', function() { describe('ol.source.Vector', function() {
@@ -24,7 +24,7 @@ describe('ol.source.Vector', function() {
var vectorSource; var vectorSource;
beforeEach(function() { beforeEach(function() {
vectorSource = new _ol_source_Vector_(); vectorSource = new VectorSource();
}); });
describe('#forEachFeatureInExtent', function() { describe('#forEachFeatureInExtent', function() {
@@ -73,7 +73,7 @@ describe('ol.source.Vector', function() {
}); });
it('adds same id features only once', function() { it('adds same id features only once', function() {
var source = new _ol_source_Vector_(); var source = new VectorSource();
var feature1 = new Feature(); var feature1 = new Feature();
feature1.setId('1'); feature1.setId('1');
var feature2 = new Feature(); var feature2 = new Feature();
@@ -95,7 +95,7 @@ describe('ol.source.Vector', function() {
features.push(new Feature(new LineString([[0, 0], [10, 10]]))); features.push(new Feature(new LineString([[0, 0], [10, 10]])));
features.push(new Feature(new Point([0, 10]))); features.push(new Feature(new Point([0, 10])));
features.push(new Feature(new Point([10, 5]))); features.push(new Feature(new Point([10, 5])));
vectorSource = new _ol_source_Vector_({ vectorSource = new VectorSource({
features: features features: features
}); });
}); });
@@ -130,7 +130,7 @@ describe('ol.source.Vector', function() {
new Feature(new Point([Math.random(), Math.random()])); new Feature(new Point([Math.random(), Math.random()]));
} }
features.push(new Feature(null)); features.push(new Feature(null));
vectorSource = new _ol_source_Vector_({ vectorSource = new VectorSource({
features: features features: features
}); });
}); });
@@ -265,7 +265,7 @@ describe('ol.source.Vector', function() {
var vectorSource; var vectorSource;
beforeEach(function() { beforeEach(function() {
vectorSource = new _ol_source_Vector_(); vectorSource = new VectorSource();
}); });
it('keeps its index up-to-date', function() { it('keeps its index up-to-date', function() {
@@ -332,7 +332,7 @@ describe('ol.source.Vector', function() {
describe('#getFeatureById()', function() { describe('#getFeatureById()', function() {
var source; var source;
beforeEach(function() { beforeEach(function() {
source = new _ol_source_Vector_(); source = new VectorSource();
}); });
it('returns a feature by id', function() { it('returns a feature by id', function() {
@@ -424,7 +424,7 @@ describe('ol.source.Vector', function() {
it('requests the view extent plus render buffer', function(done) { it('requests the view extent plus render buffer', function(done) {
var center = [-97.6114, 38.8403]; var center = [-97.6114, 38.8403];
var source = new _ol_source_Vector_({ var source = new VectorSource({
strategy: _ol_loadingstrategy_.bbox, strategy: _ol_loadingstrategy_.bbox,
loader: function(extent) { loader: function(extent) {
setTimeout(function() { setTimeout(function() {
@@ -460,7 +460,7 @@ describe('ol.source.Vector', function() {
describe('with no loader and the "all" strategy', function() { describe('with no loader and the "all" strategy', function() {
it('stores the infinity extent in the Rtree', function() { it('stores the infinity extent in the Rtree', function() {
var source = new _ol_source_Vector_(); var source = new VectorSource();
source.loadFeatures([-10000, -10000, 10000, 10000], 1, source.loadFeatures([-10000, -10000, 10000, 10000], 1,
getProjection('EPSG:3857')); getProjection('EPSG:3857'));
var loadedExtents = source.loadedExtentsRtree_.getAll(); var loadedExtents = source.loadedExtentsRtree_.getAll();
@@ -481,7 +481,7 @@ describe('ol.source.Vector', function() {
var loader2 = function(bbox, resolution, projection) { var loader2 = function(bbox, resolution, projection) {
count2++; count2++;
}; };
var source = new _ol_source_Vector_({loader: loader1}); var source = new VectorSource({loader: loader1});
source.loadFeatures([-10000, -10000, 10000, 10000], 1, source.loadFeatures([-10000, -10000, 10000, 10000], 1,
getProjection('EPSG:3857')); getProjection('EPSG:3857'));
source.setLoader(loader2); source.setLoader(loader2);
@@ -493,7 +493,7 @@ describe('ol.source.Vector', function() {
}); });
it('removes extents with #removeLoadedExtent()', function(done) { it('removes extents with #removeLoadedExtent()', function(done) {
var source = new _ol_source_Vector_(); var source = new VectorSource();
source.setLoader(function(bbox, resolution, projection) { source.setLoader(function(bbox, resolution, projection) {
setTimeout(function() { setTimeout(function() {
expect(source.loadedExtentsRtree_.getAll()).to.have.length(1); expect(source.loadedExtentsRtree_.getAll()).to.have.length(1);
@@ -511,7 +511,7 @@ describe('ol.source.Vector', function() {
describe('the feature id index', function() { describe('the feature id index', function() {
var source; var source;
beforeEach(function() { beforeEach(function() {
source = new _ol_source_Vector_(); source = new VectorSource();
}); });
it('ignores features with the same id', function() { it('ignores features with the same id', function() {
@@ -541,7 +541,7 @@ describe('ol.source.Vector', function() {
describe('the undefined feature id index', function() { describe('the undefined feature id index', function() {
var source; var source;
beforeEach(function() { beforeEach(function() {
source = new _ol_source_Vector_(); source = new VectorSource();
}); });
it('disallows adding the same feature twice', function() { it('disallows adding the same feature twice', function() {
@@ -556,7 +556,7 @@ describe('ol.source.Vector', function() {
describe('with useSpatialIndex set to false', function() { describe('with useSpatialIndex set to false', function() {
var source; var source;
beforeEach(function() { beforeEach(function() {
source = new _ol_source_Vector_({useSpatialIndex: false}); source = new VectorSource({useSpatialIndex: false});
}); });
it('returns a features collection', function() { it('returns a features collection', function() {
@@ -575,7 +575,7 @@ describe('ol.source.Vector', function() {
describe('with a collection of features', function() { describe('with a collection of features', function() {
var collection, source; var collection, source;
beforeEach(function() { beforeEach(function() {
source = new _ol_source_Vector_({ source = new VectorSource({
useSpatialIndex: false useSpatialIndex: false
}); });
collection = source.getFeaturesCollection(); collection = source.getFeaturesCollection();
@@ -623,7 +623,7 @@ describe('ol.source.Vector', function() {
var collection, source; var collection, source;
beforeEach(function() { beforeEach(function() {
collection = new _ol_Collection_(); collection = new _ol_Collection_();
source = new _ol_source_Vector_({ source = new VectorSource({
features: collection features: collection
}); });
}); });