Merge pull request #7686 from tschaub/renames

More import renaming

examples/accessible.js

@@ -1,14 +1,14 @@
 import Map from '../src/ol/Map.js';
-import _ol_View_ from '../src/ol/View.js';
+import View from '../src/ol/View.js';
 import {defaults as defaultControls} from '../src/ol/control.js';
 import TileLayer from '../src/ol/layer/Tile.js';
-import _ol_source_OSM_ from '../src/ol/source/OSM.js';
+import OSM from '../src/ol/source/OSM.js';
 
 
 var map = new Map({
   layers: [
     new TileLayer({
-      source: new _ol_source_OSM_()
+      source: new OSM()
     })
   ],
   target: 'map',
@@ -17,7 +17,7 @@ var map = new Map({
       collapsible: false
     }
   }),
-  view: new _ol_View_({
+  view: new View({
     center: [0, 0],
     zoom: 2
   })

examples/animation.js

@@ -1,9 +1,9 @@
 import Map from '../src/ol/Map.js';
-import _ol_View_ from '../src/ol/View.js';
+import View from '../src/ol/View.js';
 import {easeIn, easeOut} from '../src/ol/easing.js';
 import TileLayer from '../src/ol/layer/Tile.js';
 import {fromLonLat} from '../src/ol/proj.js';
-import _ol_source_OSM_ from '../src/ol/source/OSM.js';
+import OSM from '../src/ol/source/OSM.js';
 
 var london = fromLonLat([-0.12755, 51.507222]);
 var moscow = fromLonLat([37.6178, 55.7517]);
@@ -11,7 +11,7 @@ var istanbul = fromLonLat([28.9744, 41.0128]);
 var rome = fromLonLat([12.5, 41.9]);
 var bern = fromLonLat([7.4458, 46.95]);
 
-var view = new _ol_View_({
+var view = new View({
   center: istanbul,
   zoom: 6
 });
@@ -21,7 +21,7 @@ var map = new Map({
   layers: [
     new TileLayer({
       preload: 4,
-      source: new _ol_source_OSM_()
+      source: new OSM()
     })
   ],
   // Improve user experience by loading tiles while animating. Will make

examples/arcgis-image.js

@@ -1,19 +1,19 @@
 import Map from '../src/ol/Map.js';
-import _ol_View_ from '../src/ol/View.js';
+import View from '../src/ol/View.js';
 import TileLayer from '../src/ol/layer/Tile.js';
-import _ol_layer_Image_ from '../src/ol/layer/Image.js';
+import ImageLayer from '../src/ol/layer/Image.js';
-import _ol_source_OSM_ from '../src/ol/source/OSM.js';
+import OSM from '../src/ol/source/OSM.js';
-import _ol_source_ImageArcGISRest_ from '../src/ol/source/ImageArcGISRest.js';
+import ImageArcGISRest from '../src/ol/source/ImageArcGISRest.js';
 
 var url = 'https://sampleserver1.arcgisonline.com/ArcGIS/rest/services/' +
     'Specialty/ESRI_StateCityHighway_USA/MapServer';
 
 var layers = [
   new TileLayer({
-    source: new _ol_source_OSM_()
+    source: new OSM()
   }),
-  new _ol_layer_Image_({
+  new ImageLayer({
-    source: new _ol_source_ImageArcGISRest_({
+    source: new ImageArcGISRest({
       ratio: 1,
       params: {},
       url: url
@@ -23,7 +23,7 @@ var layers = [
 var map = new Map({
   layers: layers,
   target: 'map',
-  view: new _ol_View_({
+  view: new View({
     center: [-10997148, 4569099],
     zoom: 4
   })

examples/arcgis-tiled.js

@@ -1,19 +1,19 @@
 import Map from '../src/ol/Map.js';
-import _ol_View_ from '../src/ol/View.js';
+import View from '../src/ol/View.js';
 import TileLayer from '../src/ol/layer/Tile.js';
-import _ol_source_OSM_ from '../src/ol/source/OSM.js';
+import OSM from '../src/ol/source/OSM.js';
-import _ol_source_TileArcGISRest_ from '../src/ol/source/TileArcGISRest.js';
+import TileArcGISRest from '../src/ol/source/TileArcGISRest.js';
 
 var url = 'https://sampleserver1.arcgisonline.com/ArcGIS/rest/services/' +
     'Specialty/ESRI_StateCityHighway_USA/MapServer';
 
 var layers = [
   new TileLayer({
-    source: new _ol_source_OSM_()
+    source: new OSM()
   }),
   new TileLayer({
     extent: [-13884991, 2870341, -7455066, 6338219],
-    source: new _ol_source_TileArcGISRest_({
+    source: new TileArcGISRest({
       url: url
     })
   })
@@ -21,7 +21,7 @@ var layers = [
 var map = new Map({
   layers: layers,
   target: 'map',
-  view: new _ol_View_({
+  view: new View({
     center: [-10997148, 4569099],
     zoom: 4
   })

examples/attributions.js

@@ -1,9 +1,9 @@
 import Map from '../src/ol/Map.js';
-import _ol_View_ from '../src/ol/View.js';
+import View from '../src/ol/View.js';
 import {defaults as defaultControls} from '../src/ol/control.js';
 import Attribution from '../src/ol/control/Attribution.js';
 import TileLayer from '../src/ol/layer/Tile.js';
-import _ol_source_OSM_ from '../src/ol/source/OSM.js';
+import OSM from '../src/ol/source/OSM.js';
 
 var attribution = new Attribution({
   collapsible: false
@@ -11,12 +11,12 @@ var attribution = new Attribution({
 var map = new Map({
   layers: [
     new TileLayer({
-      source: new _ol_source_OSM_()
+      source: new OSM()
     })
   ],
   controls: defaultControls({attribution: false}).extend([attribution]),
   target: 'map',
-  view: new _ol_View_({
+  view: new View({
     center: [0, 0],
     zoom: 2
   })

examples/bing-maps.js

@@ -1,7 +1,7 @@
 import Map from '../src/ol/Map.js';
-import _ol_View_ from '../src/ol/View.js';
+import View from '../src/ol/View.js';
 import TileLayer from '../src/ol/layer/Tile.js';
-import _ol_source_BingMaps_ from '../src/ol/source/BingMaps.js';
+import BingMaps from '../src/ol/source/BingMaps.js';
 
 
 var styles = [
@@ -18,7 +18,7 @@ for (i = 0, ii = styles.length; i < ii; ++i) {
   layers.push(new TileLayer({
     visible: false,
     preload: Infinity,
-    source: new _ol_source_BingMaps_({
+    source: new BingMaps({
       key: 'As1HiMj1PvLPlqc_gtM7AqZfBL8ZL3VrjaS3zIb22Uvb9WKhuJObROC-qUpa81U5',
       imagerySet: styles[i]
       // use maxZoom 19 to see stretched tiles instead of the BingMaps
@@ -33,7 +33,7 @@ var map = new Map({
   // zooming choppy on mobile or slow devices.
   loadTilesWhileInteracting: true,
   target: 'map',
-  view: new _ol_View_({
+  view: new View({
     center: [-6655.5402445057125, 6709968.258934638],
     zoom: 13
   })

examples/blend-modes.js

@@ -1,9 +1,9 @@
-import _ol_Feature_ from '../src/ol/Feature.js';
+import Feature from '../src/ol/Feature.js';
 import Map from '../src/ol/Map.js';
-import _ol_View_ from '../src/ol/View.js';
+import View from '../src/ol/View.js';
 import Point from '../src/ol/geom/Point.js';
-import _ol_layer_Vector_ 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_Fill_ from '../src/ol/style/Fill.js';
 import _ol_style_Stroke_ from '../src/ol/style/Stroke.js';
@@ -14,9 +14,9 @@ import _ol_style_Style_ from '../src/ol/style/Style.js';
 //
 // 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
-var redLayer = new _ol_layer_Vector_({
+var redLayer = new VectorLayer({
-  source: new _ol_source_Vector_({
+  source: new VectorSource({
-    features: [new _ol_Feature_(new Point([0, 0]))]
+    features: [new Feature(new Point([0, 0]))]
   }),
   style: new _ol_style_Style_({
     image: new _ol_style_Circle_({
@@ -31,10 +31,10 @@ var redLayer = new _ol_layer_Vector_({
     })
   })
 });
-var greenLayer = new _ol_layer_Vector_({
+var greenLayer = new VectorLayer({
-  source: new _ol_source_Vector_({
+  source: new VectorSource({
     // 433.013 is roughly 250 * Math.sqrt(3)
-    features: [new _ol_Feature_(new Point([250, 433.013]))]
+    features: [new Feature(new Point([250, 433.013]))]
   }),
   style: new _ol_style_Style_({
     image: new _ol_style_Circle_({
@@ -49,9 +49,9 @@ var greenLayer = new _ol_layer_Vector_({
     })
   })
 });
-var blueLayer = new _ol_layer_Vector_({
+var blueLayer = new VectorLayer({
-  source: new _ol_source_Vector_({
+  source: new VectorSource({
-    features: [new _ol_Feature_(new Point([500, 0]))]
+    features: [new Feature(new Point([500, 0]))]
   }),
   style: new _ol_style_Style_({
     image: new _ol_style_Circle_({
@@ -76,7 +76,7 @@ var map = new Map({
     blueLayer
   ],
   target: 'map',
-  view: new _ol_View_({
+  view: new View({
     center: [250, 220],
     extent: [0, 0, 500, 500],
     resolution: 4,

examples/box-selection.js

@@ -1,16 +1,16 @@
 import Map from '../src/ol/Map.js';
-import _ol_View_ from '../src/ol/View.js';
+import View from '../src/ol/View.js';
 import _ol_events_condition_ from '../src/ol/events/condition.js';
 import GeoJSON from '../src/ol/format/GeoJSON.js';
 import DragBox from '../src/ol/interaction/DragBox.js';
 import _ol_interaction_Select_ from '../src/ol/interaction/Select.js';
 import TileLayer from '../src/ol/layer/Tile.js';
-import _ol_layer_Vector_ 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 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',
   format: new GeoJSON()
 });
@@ -19,14 +19,14 @@ var vectorSource = new _ol_source_Vector_({
 var map = new Map({
   layers: [
     new TileLayer({
-      source: new _ol_source_OSM_()
+      source: new OSM()
     }),
-    new _ol_layer_Vector_({
+    new VectorLayer({
       source: vectorSource
     })
   ],
   target: 'map',
-  view: new _ol_View_({
+  view: new View({
     center: [0, 0],
     zoom: 2
   })

examples/button-title.js

@@ -1,16 +1,16 @@
 import Map from '../src/ol/Map.js';
-import _ol_View_ from '../src/ol/View.js';
+import View from '../src/ol/View.js';
 import TileLayer from '../src/ol/layer/Tile.js';
-import _ol_source_OSM_ from '../src/ol/source/OSM.js';
+import OSM from '../src/ol/source/OSM.js';
 
 var map = new Map({
   layers: [
     new TileLayer({
-      source: new _ol_source_OSM_()
+      source: new OSM()
     })
   ],
   target: 'map',
-  view: new _ol_View_({
+  view: new View({
     center: [-8730000, 5930000],
     rotation: Math.PI / 5,
     zoom: 8

examples/canvas-gradient-pattern.js

@@ -1,11 +1,11 @@
 import Map from '../src/ol/Map.js';
-import _ol_View_ from '../src/ol/View.js';
+import View from '../src/ol/View.js';
 import * as _ol_extent_ from '../src/ol/extent.js';
 import GeoJSON from '../src/ol/format/GeoJSON.js';
 import _ol_has_ from '../src/ol/has.js';
-import _ol_layer_Vector_ from '../src/ol/layer/Vector.js';
+import VectorLayer from '../src/ol/layer/Vector.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_Stroke_ from '../src/ol/style/Stroke.js';
 import _ol_style_Style_ from '../src/ol/style/Style.js';
@@ -81,8 +81,8 @@ var getStackedStyle = function(feature, resolution) {
 };
 
 // Create a vector layer that makes use of the style function above…
-var vectorLayer = new _ol_layer_Vector_({
+var vectorLayer = new VectorLayer({
-  source: new _ol_source_Vector_({
+  source: new VectorSource({
     url: 'data/geojson/countries.geojson',
     format: new GeoJSON()
   }),
@@ -95,7 +95,7 @@ var map = new Map({
     vectorLayer
   ],
   target: 'map',
-  view: new _ol_View_({
+  view: new View({
     center: fromLonLat([7, 52]),
     zoom: 3
   })

examples/canvas-tiles.js

@@ -1,20 +1,20 @@
 import Map from '../src/ol/Map.js';
-import _ol_View_ from '../src/ol/View.js';
+import View from '../src/ol/View.js';
 import {defaults as defaultControls} from '../src/ol/control.js';
 import TileLayer from '../src/ol/layer/Tile.js';
 import {fromLonLat} from '../src/ol/proj.js';
-import _ol_source_OSM_ from '../src/ol/source/OSM.js';
+import OSM from '../src/ol/source/OSM.js';
-import _ol_source_TileDebug_ from '../src/ol/source/TileDebug.js';
+import TileDebug from '../src/ol/source/TileDebug.js';
 
 
-var osmSource = new _ol_source_OSM_();
+var osmSource = new OSM();
 var map = new Map({
   layers: [
     new TileLayer({
       source: osmSource
     }),
     new TileLayer({
-      source: new _ol_source_TileDebug_({
+      source: new TileDebug({
         projection: 'EPSG:3857',
         tileGrid: osmSource.getTileGrid()
       })
@@ -26,7 +26,7 @@ var map = new Map({
       collapsible: false
     }
   }),
-  view: new _ol_View_({
+  view: new View({
     center: fromLonLat([-0.1275, 51.507222]),
     zoom: 10
   })

examples/cartodb.js

@@ -1,8 +1,8 @@
 import Map from '../src/ol/Map.js';
-import _ol_View_ from '../src/ol/View.js';
+import View from '../src/ol/View.js';
 import TileLayer from '../src/ol/layer/Tile.js';
-import _ol_source_CartoDB_ from '../src/ol/source/CartoDB.js';
+import CartoDB from '../src/ol/source/CartoDB.js';
-import _ol_source_OSM_ from '../src/ol/source/OSM.js';
+import OSM from '../src/ol/source/OSM.js';
 
 var mapConfig = {
   'layers': [{
@@ -15,7 +15,7 @@ var mapConfig = {
   }]
 };
 
-var cartoDBSource = new _ol_source_CartoDB_({
+var cartoDBSource = new CartoDB({
   account: 'documentation',
   config: mapConfig
 });
@@ -23,14 +23,14 @@ var cartoDBSource = new _ol_source_CartoDB_({
 var map = new Map({
   layers: [
     new TileLayer({
-      source: new _ol_source_OSM_()
+      source: new OSM()
     }),
     new TileLayer({
       source: cartoDBSource
     })
   ],
   target: 'map',
-  view: new _ol_View_({
+  view: new View({
     center: [0, 0],
     zoom: 2
   })

examples/center.js

@@ -1,17 +1,17 @@
 import Map from '../src/ol/Map.js';
-import _ol_View_ from '../src/ol/View.js';
+import View from '../src/ol/View.js';
 import {defaults as defaultControls} from '../src/ol/control.js';
 import GeoJSON from '../src/ol/format/GeoJSON.js';
 import TileLayer from '../src/ol/layer/Tile.js';
-import _ol_layer_Vector_ 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 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_Fill_ from '../src/ol/style/Fill.js';
 import _ol_style_Stroke_ from '../src/ol/style/Stroke.js';
 import _ol_style_Style_ from '../src/ol/style/Style.js';
 
-var source = new _ol_source_Vector_({
+var source = new VectorSource({
   url: 'data/geojson/switzerland.geojson',
   format: new GeoJSON()
 });
@@ -34,18 +34,18 @@ var style = new _ol_style_Style_({
     })
   })
 });
-var vectorLayer = new _ol_layer_Vector_({
+var vectorLayer = new VectorLayer({
   source: source,
   style: style
 });
-var view = new _ol_View_({
+var view = new View({
   center: [0, 0],
   zoom: 1
 });
 var map = new Map({
   layers: [
     new TileLayer({
-      source: new _ol_source_OSM_()
+      source: new OSM()
     }),
     vectorLayer
   ],

examples/cluster.js

@@ -1,12 +1,12 @@
-import _ol_Feature_ from '../src/ol/Feature.js';
+import Feature from '../src/ol/Feature.js';
 import Map from '../src/ol/Map.js';
-import _ol_View_ from '../src/ol/View.js';
+import View from '../src/ol/View.js';
 import Point from '../src/ol/geom/Point.js';
 import TileLayer from '../src/ol/layer/Tile.js';
-import _ol_layer_Vector_ 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 Cluster from '../src/ol/source/Cluster.js';
-import _ol_source_OSM_ from '../src/ol/source/OSM.js';
+import 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_Fill_ from '../src/ol/style/Fill.js';
 import _ol_style_Stroke_ from '../src/ol/style/Stroke.js';
@@ -21,20 +21,20 @@ var features = new Array(count);
 var e = 4500000;
 for (var i = 0; i < count; ++i) {
   var coordinates = [2 * e * Math.random() - e, 2 * e * Math.random() - e];
-  features[i] = new _ol_Feature_(new Point(coordinates));
+  features[i] = new Feature(new Point(coordinates));
 }
 
-var source = new _ol_source_Vector_({
+var source = new VectorSource({
   features: features
 });
 
-var clusterSource = new _ol_source_Cluster_({
+var clusterSource = new Cluster({
   distance: parseInt(distance.value, 10),
   source: source
 });
 
 var styleCache = {};
-var clusters = new _ol_layer_Vector_({
+var clusters = new VectorLayer({
   source: clusterSource,
   style: function(feature) {
     var size = feature.get('features').length;
@@ -64,13 +64,13 @@ var clusters = new _ol_layer_Vector_({
 });
 
 var raster = new TileLayer({
-  source: new _ol_source_OSM_()
+  source: new OSM()
 });
 
 var map = new Map({
   layers: [raster, clusters],
   target: 'map',
-  view: new _ol_View_({
+  view: new View({
     center: [0, 0],
     zoom: 2
   })

examples/color-manipulation.js

@@ -1,9 +1,9 @@
 // NOCOMPILE
 import Map from '../src/ol/Map.js';
-import _ol_View_ from '../src/ol/View.js';
+import View from '../src/ol/View.js';
-import _ol_layer_Image_ from '../src/ol/layer/Image.js';
+import ImageLayer from '../src/ol/layer/Image.js';
 import RasterSource from '../src/ol/source/Raster.js';
-import _ol_source_Stamen_ from '../src/ol/source/Stamen.js';
+import Stamen from '../src/ol/source/Stamen.js';
 
 
 /**
@@ -101,7 +101,7 @@ function xyz2rgb(x) {
 }
 
 var raster = new RasterSource({
-  sources: [new _ol_source_Stamen_({
+  sources: [new Stamen({
     layer: 'watercolor',
     transition: 0
   })],
@@ -150,12 +150,12 @@ raster.on('beforeoperations', function(event) {
 
 var map = new Map({
   layers: [
-    new _ol_layer_Image_({
+    new ImageLayer({
       source: raster
     })
   ],
   target: 'map',
-  view: new _ol_View_({
+  view: new View({
     center: [0, 2500000],
     zoom: 2,
     maxZoom: 18

examples/custom-controls.js

@@ -1,10 +1,10 @@
 import {inherits} from '../src/ol/index.js';
 import Map from '../src/ol/Map.js';
-import _ol_View_ from '../src/ol/View.js';
+import View from '../src/ol/View.js';
 import {defaults as defaultControls} from '../src/ol/control.js';
 import Control from '../src/ol/control/Control.js';
 import TileLayer from '../src/ol/layer/Tile.js';
-import _ol_source_OSM_ from '../src/ol/source/OSM.js';
+import OSM from '../src/ol/source/OSM.js';
 
 
 /**
@@ -67,11 +67,11 @@ var map = new Map({
   ]),
   layers: [
     new TileLayer({
-      source: new _ol_source_OSM_()
+      source: new OSM()
     })
   ],
   target: 'map',
-  view: new _ol_View_({
+  view: new View({
     center: [0, 0],
     zoom: 3,
     rotation: 1

examples/custom-interactions.js

@@ -1,16 +1,16 @@
 import {inherits} from '../src/ol/index.js';
-import _ol_Feature_ from '../src/ol/Feature.js';
+import Feature from '../src/ol/Feature.js';
 import Map from '../src/ol/Map.js';
-import _ol_View_ from '../src/ol/View.js';
+import View from '../src/ol/View.js';
 import LineString from '../src/ol/geom/LineString.js';
 import Point from '../src/ol/geom/Point.js';
 import Polygon from '../src/ol/geom/Polygon.js';
 import {defaults as defaultInteractions} from '../src/ol/interaction.js';
 import _ol_interaction_Pointer_ from '../src/ol/interaction/Pointer.js';
 import TileLayer from '../src/ol/layer/Tile.js';
-import _ol_layer_Vector_ 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 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_Icon_ from '../src/ol/style/Icon.js';
 import _ol_style_Stroke_ from '../src/ol/style/Stroke.js';
@@ -134,12 +134,12 @@ app.Drag.prototype.handleUpEvent = function() {
 };
 
 
-var pointFeature = new _ol_Feature_(new Point([0, 0]));
+var pointFeature = new Feature(new Point([0, 0]));
 
-var lineFeature = new _ol_Feature_(
+var lineFeature = new Feature(
     new LineString([[-1e7, 1e6], [-1e6, 3e6]]));
 
-var polygonFeature = new _ol_Feature_(
+var polygonFeature = new Feature(
     new Polygon([[[-3e6, -1e6], [-3e6, 1e6],
       [-1e6, 1e6], [-1e6, -1e6], [-3e6, -1e6]]]));
 
@@ -148,12 +148,12 @@ var map = new Map({
   interactions: defaultInteractions().extend([new app.Drag()]),
   layers: [
     new TileLayer({
-      source: new _ol_source_TileJSON_({
+      source: new TileJSON({
         url: 'https://api.tiles.mapbox.com/v3/mapbox.geography-class.json?secure'
       })
     }),
-    new _ol_layer_Vector_({
+    new VectorLayer({
-      source: new _ol_source_Vector_({
+      source: new VectorSource({
         features: [pointFeature, lineFeature, polygonFeature]
       }),
       style: new _ol_style_Style_({
@@ -175,7 +175,7 @@ var map = new Map({
     })
   ],
   target: 'map',
-  view: new _ol_View_({
+  view: new View({
     center: [0, 0],
     zoom: 2
   })

examples/d3.js

@@ -1,24 +1,24 @@
 // NOCOMPILE
 import Map from '../src/ol/Map.js';
-import _ol_View_ from '../src/ol/View.js';
+import View from '../src/ol/View.js';
 import {getWidth, getCenter} from '../src/ol/extent.js';
-import _ol_layer_Image_ from '../src/ol/layer/Image.js';
+import ImageLayer from '../src/ol/layer/Image.js';
 import TileLayer from '../src/ol/layer/Tile.js';
 import {fromLonLat, toLonLat} from '../src/ol/proj.js';
-import _ol_source_ImageCanvas_ from '../src/ol/source/ImageCanvas.js';
+import ImageCanvasSource from '../src/ol/source/ImageCanvas.js';
-import _ol_source_Stamen_ from '../src/ol/source/Stamen.js';
+import Stamen from '../src/ol/source/Stamen.js';
 
 
 var map = new Map({
   layers: [
     new TileLayer({
-      source: new _ol_source_Stamen_({
+      source: new Stamen({
         layer: 'watercolor'
       })
     })
   ],
   target: 'map',
-  view: new _ol_View_({
+  view: new View({
     center: fromLonLat([-97, 38]),
     zoom: 4
   })
@@ -80,8 +80,8 @@ d3.json('data/topojson/us.json', function(error, us) {
     return canvas.node();
   };
 
-  var layer = new _ol_layer_Image_({
+  var layer = new ImageLayer({
-    source: new _ol_source_ImageCanvas_({
+    source: new ImageCanvasSource({
       canvasFunction: canvasFunction,
       projection: 'EPSG:3857'
     })

examples/device-orientation.js

@@ -1,19 +1,19 @@
 // NOCOMPILE
 import Map from '../src/ol/Map.js';
-import _ol_View_ from '../src/ol/View.js';
+import View from '../src/ol/View.js';
 import {defaults as defaultControls} from '../src/ol/control.js';
 import TileLayer from '../src/ol/layer/Tile.js';
 import {toRadians} from '../src/ol/math.js';
-import _ol_source_OSM_ from '../src/ol/source/OSM.js';
+import OSM from '../src/ol/source/OSM.js';
 
-var view = new _ol_View_({
+var view = new View({
   center: [0, 0],
   zoom: 2
 });
 var map = new Map({
   layers: [
     new TileLayer({
-      source: new _ol_source_OSM_()
+      source: new OSM()
     })
   ],
   target: 'map',

examples/drag-and-drop-image-vector.js

@@ -1,5 +1,5 @@
 import Map from '../src/ol/Map.js';
-import _ol_View_ from '../src/ol/View.js';
+import View from '../src/ol/View.js';
 import GPX from '../src/ol/format/GPX.js';
 import GeoJSON from '../src/ol/format/GeoJSON.js';
 import IGC from '../src/ol/format/IGC.js';
@@ -7,10 +7,10 @@ import KML from '../src/ol/format/KML.js';
 import TopoJSON from '../src/ol/format/TopoJSON.js';
 import {defaults as defaultInteractions} from '../src/ol/interaction.js';
 import DragAndDrop from '../src/ol/interaction/DragAndDrop.js';
-import _ol_layer_Vector_ from '../src/ol/layer/Vector.js';
+import VectorLayer from '../src/ol/layer/Vector.js';
 import TileLayer from '../src/ol/layer/Tile.js';
-import _ol_source_BingMaps_ from '../src/ol/source/BingMaps.js';
+import 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_Fill_ from '../src/ol/style/Fill.js';
 import _ol_style_Stroke_ from '../src/ol/style/Stroke.js';
@@ -97,24 +97,24 @@ var map = new Map({
   interactions: defaultInteractions().extend([dragAndDropInteraction]),
   layers: [
     new TileLayer({
-      source: new _ol_source_BingMaps_({
+      source: new BingMaps({
         imagerySet: 'Aerial',
         key: 'As1HiMj1PvLPlqc_gtM7AqZfBL8ZL3VrjaS3zIb22Uvb9WKhuJObROC-qUpa81U5'
       })
     })
   ],
   target: 'map',
-  view: new _ol_View_({
+  view: new View({
     center: [0, 0],
     zoom: 2
   })
 });
 
 dragAndDropInteraction.on('addfeatures', function(event) {
-  var vectorSource = new _ol_source_Vector_({
+  var vectorSource = new VectorSource({
     features: event.features
   });
-  map.addLayer(new _ol_layer_Vector_({
+  map.addLayer(new VectorLayer({
     renderMode: 'image',
     source: vectorSource,
     style: styleFunction

examples/drag-and-drop.js

@@ -1,5 +1,5 @@
 import Map from '../src/ol/Map.js';
-import _ol_View_ from '../src/ol/View.js';
+import View from '../src/ol/View.js';
 import GPX from '../src/ol/format/GPX.js';
 import GeoJSON from '../src/ol/format/GeoJSON.js';
 import IGC from '../src/ol/format/IGC.js';
@@ -8,9 +8,9 @@ import TopoJSON from '../src/ol/format/TopoJSON.js';
 import {defaults as defaultInteractions} from '../src/ol/interaction.js';
 import DragAndDrop from '../src/ol/interaction/DragAndDrop.js';
 import TileLayer from '../src/ol/layer/Tile.js';
-import _ol_layer_Vector_ 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 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_Fill_ from '../src/ol/style/Fill.js';
 import _ol_style_Stroke_ from '../src/ol/style/Stroke.js';
@@ -97,24 +97,24 @@ var map = new Map({
   interactions: defaultInteractions().extend([dragAndDropInteraction]),
   layers: [
     new TileLayer({
-      source: new _ol_source_BingMaps_({
+      source: new BingMaps({
         imagerySet: 'Aerial',
         key: 'As1HiMj1PvLPlqc_gtM7AqZfBL8ZL3VrjaS3zIb22Uvb9WKhuJObROC-qUpa81U5'
       })
     })
   ],
   target: 'map',
-  view: new _ol_View_({
+  view: new View({
     center: [0, 0],
     zoom: 2
   })
 });
 
 dragAndDropInteraction.on('addfeatures', function(event) {
-  var vectorSource = new _ol_source_Vector_({
+  var vectorSource = new VectorSource({
     features: event.features
   });
-  map.addLayer(new _ol_layer_Vector_({
+  map.addLayer(new VectorLayer({
     source: vectorSource,
     style: styleFunction
   }));

examples/drag-rotate-and-zoom.js

@@ -1,9 +1,9 @@
 import Map from '../src/ol/Map.js';
-import _ol_View_ from '../src/ol/View.js';
+import View from '../src/ol/View.js';
 import {defaults as defaultInteractions} from '../src/ol/interaction.js';
 import DragRotateAndZoom from '../src/ol/interaction/DragRotateAndZoom.js';
 import TileLayer from '../src/ol/layer/Tile.js';
-import _ol_source_OSM_ from '../src/ol/source/OSM.js';
+import OSM from '../src/ol/source/OSM.js';
 
 
 var map = new Map({
@@ -12,11 +12,11 @@ var map = new Map({
   ]),
   layers: [
     new TileLayer({
-      source: new _ol_source_OSM_()
+      source: new OSM()
     })
   ],
   target: 'map',
-  view: new _ol_View_({
+  view: new View({
     center: [0, 0],
     zoom: 2
   })

examples/draw-and-modify-features.js

@@ -1,23 +1,23 @@
 import Map from '../src/ol/Map.js';
-import _ol_View_ from '../src/ol/View.js';
+import View from '../src/ol/View.js';
 import Draw from '../src/ol/interaction/Draw.js';
 import _ol_interaction_Modify_ from '../src/ol/interaction/Modify.js';
 import _ol_interaction_Snap_ from '../src/ol/interaction/Snap.js';
 import TileLayer from '../src/ol/layer/Tile.js';
-import _ol_layer_Vector_ 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 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_Fill_ from '../src/ol/style/Fill.js';
 import _ol_style_Stroke_ from '../src/ol/style/Stroke.js';
 import _ol_style_Style_ from '../src/ol/style/Style.js';
 
 var raster = new TileLayer({
-  source: new _ol_source_OSM_()
+  source: new OSM()
 });
 
-var source = new _ol_source_Vector_();
+var source = new VectorSource();
-var vector = new _ol_layer_Vector_({
+var vector = new VectorLayer({
   source: source,
   style: new _ol_style_Style_({
     fill: new _ol_style_Fill_({
@@ -39,7 +39,7 @@ var vector = new _ol_layer_Vector_({
 var map = new Map({
   layers: [raster, vector],
   target: 'map',
-  view: new _ol_View_({
+  view: new View({
     center: [-11000000, 4600000],
     zoom: 4
   })

examples/draw-features.js

@@ -1,25 +1,25 @@
 import Map from '../src/ol/Map.js';
-import _ol_View_ from '../src/ol/View.js';
+import View from '../src/ol/View.js';
 import Draw from '../src/ol/interaction/Draw.js';
 import TileLayer from '../src/ol/layer/Tile.js';
-import _ol_layer_Vector_ 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 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({
-  source: new _ol_source_OSM_()
+  source: new OSM()
 });
 
-var source = new _ol_source_Vector_({wrapX: false});
+var source = new VectorSource({wrapX: false});
 
-var vector = new _ol_layer_Vector_({
+var vector = new VectorLayer({
   source: source
 });
 
 var map = new Map({
   layers: [raster, vector],
   target: 'map',
-  view: new _ol_View_({
+  view: new View({
     center: [-11000000, 4600000],
     zoom: 4
   })

examples/draw-freehand.js

@@ -1,25 +1,25 @@
 import Map from '../src/ol/Map.js';
-import _ol_View_ from '../src/ol/View.js';
+import View from '../src/ol/View.js';
 import Draw from '../src/ol/interaction/Draw.js';
 import TileLayer from '../src/ol/layer/Tile.js';
-import _ol_layer_Vector_ 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 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({
-  source: new _ol_source_OSM_()
+  source: new OSM()
 });
 
-var source = new _ol_source_Vector_({wrapX: false});
+var source = new VectorSource({wrapX: false});
 
-var vector = new _ol_layer_Vector_({
+var vector = new VectorLayer({
   source: source
 });
 
 var map = new Map({
   layers: [raster, vector],
   target: 'map',
-  view: new _ol_View_({
+  view: new View({
     center: [-11000000, 4600000],
     zoom: 4
   })

examples/draw-shapes.js

@@ -1,26 +1,26 @@
 import Map from '../src/ol/Map.js';
-import _ol_View_ from '../src/ol/View.js';
+import View from '../src/ol/View.js';
 import Polygon from '../src/ol/geom/Polygon.js';
 import Draw from '../src/ol/interaction/Draw.js';
 import TileLayer from '../src/ol/layer/Tile.js';
-import _ol_layer_Vector_ 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 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({
-  source: new _ol_source_OSM_()
+  source: new OSM()
 });
 
-var source = new _ol_source_Vector_({wrapX: false});
+var source = new VectorSource({wrapX: false});
 
-var vector = new _ol_layer_Vector_({
+var vector = new VectorLayer({
   source: source
 });
 
 var map = new Map({
   layers: [raster, vector],
   target: 'map',
-  view: new _ol_View_({
+  view: new View({
     center: [-11000000, 4600000],
     zoom: 4
   })

examples/dynamic-data.js

@@ -1,9 +1,9 @@
 import Map from '../src/ol/Map.js';
-import _ol_View_ from '../src/ol/View.js';
+import View from '../src/ol/View.js';
 import MultiPoint from '../src/ol/geom/MultiPoint.js';
 import Point from '../src/ol/geom/Point.js';
 import TileLayer from '../src/ol/layer/Tile.js';
-import _ol_source_OSM_ from '../src/ol/source/OSM.js';
+import OSM from '../src/ol/source/OSM.js';
 import _ol_style_Circle_ from '../src/ol/style/Circle.js';
 import _ol_style_Fill_ from '../src/ol/style/Fill.js';
 import _ol_style_Stroke_ from '../src/ol/style/Stroke.js';
@@ -13,11 +13,11 @@ import _ol_style_Style_ from '../src/ol/style/Style.js';
 var map = new Map({
   layers: [
     new TileLayer({
-      source: new _ol_source_OSM_()
+      source: new OSM()
     })
   ],
   target: 'map',
-  view: new _ol_View_({
+  view: new View({
     center: [0, 0],
     zoom: 2
   })

examples/earthquake-clusters.js

@@ -1,14 +1,14 @@
 import Map from '../src/ol/Map.js';
-import _ol_View_ from '../src/ol/View.js';
+import View from '../src/ol/View.js';
 import * as _ol_extent_ from '../src/ol/extent.js';
 import KML from '../src/ol/format/KML.js';
 import {defaults as defaultInteractions} from '../src/ol/interaction.js';
 import _ol_interaction_Select_ from '../src/ol/interaction/Select.js';
 import TileLayer from '../src/ol/layer/Tile.js';
-import _ol_layer_Vector_ 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 Cluster from '../src/ol/source/Cluster.js';
-import _ol_source_Stamen_ from '../src/ol/source/Stamen.js';
+import 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_Fill_ from '../src/ol/style/Fill.js';
 import _ol_style_RegularShape_ from '../src/ol/style/RegularShape.js';
@@ -121,10 +121,10 @@ function selectStyleFunction(feature) {
   return styles;
 }
 
-vector = new _ol_layer_Vector_({
+vector = new VectorLayer({
-  source: new _ol_source_Cluster_({
+  source: new Cluster({
     distance: 40,
-    source: new _ol_source_Vector_({
+    source: new VectorSource({
       url: 'data/kml/2012_Earthquakes_Mag5.kml',
       format: new KML({
         extractStyles: false
@@ -135,7 +135,7 @@ vector = new _ol_layer_Vector_({
 });
 
 var raster = new TileLayer({
-  source: new _ol_source_Stamen_({
+  source: new Stamen({
     layer: 'toner'
   })
 });
@@ -150,7 +150,7 @@ var map = new Map({
     style: selectStyleFunction
   })]),
   target: 'map',
-  view: new _ol_View_({
+  view: new View({
     center: [0, 0],
     zoom: 2
   })

examples/earthquake-custom-symbol.js

@@ -1,12 +1,12 @@
 import Map from '../src/ol/Map.js';
-import _ol_View_ from '../src/ol/View.js';
+import View from '../src/ol/View.js';
 import KML from '../src/ol/format/KML.js';
 import Polygon from '../src/ol/geom/Polygon.js';
 import TileLayer from '../src/ol/layer/Tile.js';
-import _ol_layer_Vector_ from '../src/ol/layer/Vector.js';
+import VectorLayer from '../src/ol/layer/Vector.js';
 import _ol_render_ from '../src/ol/render.js';
-import _ol_source_Stamen_ from '../src/ol/source/Stamen.js';
+import 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_Icon_ from '../src/ol/style/Icon.js';
 import _ol_style_Stroke_ from '../src/ol/style/Stroke.js';
@@ -52,8 +52,8 @@ var styleFunction = function(feature) {
   return style;
 };
 
-var vector = new _ol_layer_Vector_({
+var vector = new VectorLayer({
-  source: new _ol_source_Vector_({
+  source: new VectorSource({
     url: 'data/kml/2012_Earthquakes_Mag5.kml',
     format: new KML({
       extractStyles: false
@@ -63,7 +63,7 @@ var vector = new _ol_layer_Vector_({
 });
 
 var raster = new TileLayer({
-  source: new _ol_source_Stamen_({
+  source: new Stamen({
     layer: 'toner'
   })
 });
@@ -71,7 +71,7 @@ var raster = new TileLayer({
 var map = new Map({
   layers: [raster, vector],
   target: 'map',
-  view: new _ol_View_({
+  view: new View({
     center: [0, 0],
     zoom: 2
   })

examples/epsg-4326.js

@@ -1,14 +1,14 @@
 import Map from '../src/ol/Map.js';
-import _ol_View_ from '../src/ol/View.js';
+import View from '../src/ol/View.js';
 import {defaults as defaultControls} from '../src/ol/control.js';
 import ScaleLine from '../src/ol/control/ScaleLine.js';
 import TileLayer from '../src/ol/layer/Tile.js';
-import _ol_source_TileWMS_ from '../src/ol/source/TileWMS.js';
+import TileWMS from '../src/ol/source/TileWMS.js';
 
 
 var layers = [
   new TileLayer({
-    source: new _ol_source_TileWMS_({
+    source: new TileWMS({
       url: 'https://ahocevar.com/geoserver/wms',
       params: {
         'LAYERS': 'ne:NE1_HR_LC_SR_W_DR',
@@ -26,7 +26,7 @@ var map = new Map({
   ]),
   layers: layers,
   target: 'map',
-  view: new _ol_View_({
+  view: new View({
     projection: 'EPSG:4326',
     center: [0, 0],
     zoom: 2

examples/export-map.js

@@ -1,21 +1,21 @@
 // NOCOMPILE
 // this example uses FileSaver.js for which we don't have an externs file.
 import Map from '../src/ol/Map.js';
-import _ol_View_ from '../src/ol/View.js';
+import View from '../src/ol/View.js';
 import {defaults as defaultControls} from '../src/ol/control.js';
 import GeoJSON from '../src/ol/format/GeoJSON.js';
 import TileLayer from '../src/ol/layer/Tile.js';
-import _ol_layer_Vector_ 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 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({
   layers: [
     new TileLayer({
-      source: new _ol_source_OSM_()
+      source: new OSM()
     }),
-    new _ol_layer_Vector_({
+    new VectorLayer({
-      source: new _ol_source_Vector_({
+      source: new VectorSource({
         url: 'data/geojson/countries.geojson',
         format: new GeoJSON()
       })
@@ -27,7 +27,7 @@ var map = new Map({
       collapsible: false
     }
   }),
-  view: new _ol_View_({
+  view: new View({
     center: [0, 0],
     zoom: 2
   })

examples/export-pdf.js

@@ -1,15 +1,15 @@
 // NOCOMPILE
 import Map from '../src/ol/Map.js';
-import _ol_View_ from '../src/ol/View.js';
+import View from '../src/ol/View.js';
 import {defaults as defaultControls} from '../src/ol/control.js';
 import WKT from '../src/ol/format/WKT.js';
 import TileLayer from '../src/ol/layer/Tile.js';
-import _ol_layer_Vector_ 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 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({
-  source: new _ol_source_OSM_()
+  source: new OSM()
 });
 
 var format = new WKT();
@@ -19,8 +19,8 @@ var feature = format.readFeature(
         '-39.1552734375, 10.689697265625 -25.0927734375))');
 feature.getGeometry().transform('EPSG:4326', 'EPSG:3857');
 
-var vector = new _ol_layer_Vector_({
+var vector = new VectorLayer({
-  source: new _ol_source_Vector_({
+  source: new VectorSource({
     features: [feature]
   })
 });
@@ -34,7 +34,7 @@ var map = new Map({
       collapsible: false
     }
   }),
-  view: new _ol_View_({
+  view: new View({
     center: [0, 0],
     zoom: 2
   })

examples/extent-interaction.js

@@ -1,14 +1,14 @@
 import Map from '../src/ol/Map.js';
-import _ol_View_ from '../src/ol/View.js';
+import View from '../src/ol/View.js';
 import _ol_events_condition_ from '../src/ol/events/condition.js';
 import GeoJSON from '../src/ol/format/GeoJSON.js';
 import _ol_interaction_Extent_ from '../src/ol/interaction/Extent.js';
 import TileLayer from '../src/ol/layer/Tile.js';
-import _ol_layer_Vector_ 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 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',
   format: new GeoJSON()
 });
@@ -16,14 +16,14 @@ var vectorSource = new _ol_source_Vector_({
 var map = new Map({
   layers: [
     new TileLayer({
-      source: new _ol_source_OSM_()
+      source: new OSM()
     }),
-    new _ol_layer_Vector_({
+    new VectorLayer({
       source: vectorSource
     })
   ],
   target: 'map',
-  view: new _ol_View_({
+  view: new View({
     center: [0, 0],
     zoom: 2
   })

examples/feature-animation.js

@@ -1,15 +1,15 @@
-import _ol_Feature_ from '../src/ol/Feature.js';
+import Feature from '../src/ol/Feature.js';
 import Map from '../src/ol/Map.js';
-import _ol_Observable_ from '../src/ol/Observable.js';
+import Observable from '../src/ol/Observable.js';
-import _ol_View_ from '../src/ol/View.js';
+import View from '../src/ol/View.js';
 import {defaults as defaultControls} from '../src/ol/control.js';
 import {easeOut} from '../src/ol/easing.js';
 import Point from '../src/ol/geom/Point.js';
 import TileLayer from '../src/ol/layer/Tile.js';
-import _ol_layer_Vector_ from '../src/ol/layer/Vector.js';
+import VectorLayer from '../src/ol/layer/Vector.js';
 import {fromLonLat} from '../src/ol/proj.js';
-import _ol_source_OSM_ from '../src/ol/source/OSM.js';
+import 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_Stroke_ from '../src/ol/style/Stroke.js';
 import _ol_style_Style_ from '../src/ol/style/Style.js';
@@ -18,7 +18,7 @@ import _ol_style_Style_ from '../src/ol/style/Style.js';
 var map = new Map({
   layers: [
     new TileLayer({
-      source: new _ol_source_OSM_({
+      source: new OSM({
         wrapX: false
       })
     })
@@ -29,16 +29,16 @@ var map = new Map({
     }
   }),
   target: 'map',
-  view: new _ol_View_({
+  view: new View({
     center: [0, 0],
     zoom: 1
   })
 });
 
-var source = new _ol_source_Vector_({
+var source = new VectorSource({
   wrapX: false
 });
-var vector = new _ol_layer_Vector_({
+var vector = new VectorLayer({
   source: source
 });
 map.addLayer(vector);
@@ -47,7 +47,7 @@ function addRandomFeature() {
   var x = Math.random() * 360 - 180;
   var y = Math.random() * 180 - 90;
   var geom = new Point(fromLonLat([x, y]));
-  var feature = new _ol_Feature_(geom);
+  var feature = new Feature(geom);
   source.addFeature(feature);
 }
 
@@ -80,7 +80,7 @@ function flash(feature) {
     vectorContext.setStyle(style);
     vectorContext.drawGeometry(flashGeom);
     if (elapsed > duration) {
-      _ol_Observable_.unByKey(listenerKey);
+      Observable.unByKey(listenerKey);
       return;
     }
     // tell OpenLayers to continue postcompose animation

examples/feature-move-animation.js

@@ -1,12 +1,12 @@
-import _ol_Feature_ from '../src/ol/Feature.js';
+import Feature from '../src/ol/Feature.js';
 import Map from '../src/ol/Map.js';
-import _ol_View_ from '../src/ol/View.js';
+import View from '../src/ol/View.js';
 import Polyline from '../src/ol/format/Polyline.js';
 import Point from '../src/ol/geom/Point.js';
 import TileLayer from '../src/ol/layer/Tile.js';
-import _ol_layer_Vector_ 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 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_Fill_ from '../src/ol/style/Fill.js';
 import _ol_style_Icon_ from '../src/ol/style/Icon.js';
@@ -67,19 +67,19 @@ var route = /** @type {ol.geom.LineString} */ (new Polyline({
 var routeCoords = route.getCoordinates();
 var routeLength = routeCoords.length;
 
-var routeFeature = new _ol_Feature_({
+var routeFeature = new Feature({
   type: 'route',
   geometry: route
 });
-var geoMarker = new _ol_Feature_({
+var geoMarker = new Feature({
   type: 'geoMarker',
   geometry: new Point(routeCoords[0])
 });
-var startMarker = new _ol_Feature_({
+var startMarker = new Feature({
   type: 'icon',
   geometry: new Point(routeCoords[0])
 });
-var endMarker = new _ol_Feature_({
+var endMarker = new Feature({
   type: 'icon',
   geometry: new Point(routeCoords[routeLength - 1])
 });
@@ -113,8 +113,8 @@ var speed, now;
 var speedInput = document.getElementById('speed');
 var startButton = document.getElementById('start-animation');
 
-var vectorLayer = new _ol_layer_Vector_({
+var vectorLayer = new VectorLayer({
-  source: new _ol_source_Vector_({
+  source: new VectorSource({
     features: [routeFeature, geoMarker, startMarker, endMarker]
   }),
   style: function(feature) {
@@ -130,7 +130,7 @@ var center = [-5639523.95, -3501274.52];
 var map = new Map({
   target: document.getElementById('map'),
   loadTilesWhileAnimating: true,
-  view: new _ol_View_({
+  view: new View({
     center: center,
     zoom: 10,
     minZoom: 2,
@@ -138,7 +138,7 @@ var map = new Map({
   }),
   layers: [
     new TileLayer({
-      source: new _ol_source_BingMaps_({
+      source: new BingMaps({
         imagerySet: 'AerialWithLabels',
         key: 'As1HiMj1PvLPlqc_gtM7AqZfBL8ZL3VrjaS3zIb22Uvb9WKhuJObROC-qUpa81U5'
       })
@@ -163,7 +163,7 @@ var moveFeature = function(event) {
     }
 
     var currentPoint = new Point(routeCoords[index]);
-    var feature = new _ol_Feature_(currentPoint);
+    var feature = new Feature(currentPoint);
     vectorContext.drawFeature(feature, styles.geoMarker);
   }
   // tell OpenLayers to continue the postcompose animation

examples/flight-animation.js

@@ -1,25 +1,25 @@
 // NOCOMPILE
-import _ol_Feature_ from '../src/ol/Feature.js';
+import Feature from '../src/ol/Feature.js';
 import Map from '../src/ol/Map.js';
-import _ol_View_ from '../src/ol/View.js';
+import View from '../src/ol/View.js';
 import LineString from '../src/ol/geom/LineString.js';
 import TileLayer from '../src/ol/layer/Tile.js';
-import _ol_layer_Vector_ 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 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_Style_ from '../src/ol/style/Style.js';
 
 var map = new Map({
   layers: [
     new TileLayer({
-      source: new _ol_source_Stamen_({
+      source: new Stamen({
         layer: 'toner'
       })
     })
   ],
   target: 'map',
-  view: new _ol_View_({
+  view: new View({
     center: [0, 0],
     zoom: 2
   })
@@ -70,7 +70,7 @@ var animateFlights = function(event) {
   map.render();
 };
 
-flightsSource = new _ol_source_Vector_({
+flightsSource = new VectorSource({
   wrapX: false,
   attributions: 'Flight data by ' +
         '<a href="http://openflights.org/data.html">OpenFlights</a>,',
@@ -95,7 +95,7 @@ flightsSource = new _ol_source_Vector_({
           var line = new LineString(arcLine.geometries[0].coords);
           line.transform('EPSG:4326', 'EPSG:3857');
 
-          var feature = new _ol_Feature_({
+          var feature = new Feature({
             geometry: line,
             finished: false
           });
@@ -109,7 +109,7 @@ flightsSource = new _ol_source_Vector_({
   }
 });
 
-var flightsLayer = new _ol_layer_Vector_({
+var flightsLayer = new VectorLayer({
   source: flightsSource,
   style: function(feature) {
     // if the animation is still active for a feature, do not

examples/fractal.js

@@ -1,9 +1,9 @@
-import _ol_Feature_ from '../src/ol/Feature.js';
+import Feature from '../src/ol/Feature.js';
 import Map from '../src/ol/Map.js';
-import _ol_View_ from '../src/ol/View.js';
+import View from '../src/ol/View.js';
 import LineString from '../src/ol/geom/LineString.js';
-import _ol_layer_Vector_ 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 cos30 = Math.cos(Math.PI / 6);
@@ -15,10 +15,10 @@ var triangle = new LineString([
   [0, radius], [run, -rise], [-run, -rise], [0, radius]
 ]);
 
-var feature = new _ol_Feature_(triangle);
+var feature = new Feature(triangle);
 
-var layer = new _ol_layer_Vector_({
+var layer = new VectorLayer({
-  source: new _ol_source_Vector_({
+  source: new VectorSource({
     features: [feature]
   })
 });
@@ -26,7 +26,7 @@ var layer = new _ol_layer_Vector_({
 var map = new Map({
   layers: [layer],
   target: 'map',
-  view: new _ol_View_({
+  view: new View({
     center: [0, 0],
     zoom: 1
   })

examples/full-screen-drag-rotate-and-zoom.js

@@ -1,11 +1,11 @@
 import Map from '../src/ol/Map.js';
-import _ol_View_ from '../src/ol/View.js';
+import View from '../src/ol/View.js';
 import {defaults as defaultControls} from '../src/ol/control.js';
 import FullScreen from '../src/ol/control/FullScreen.js';
 import {defaults as defaultInteractions} from '../src/ol/interaction.js';
 import DragRotateAndZoom from '../src/ol/interaction/DragRotateAndZoom.js';
 import TileLayer from '../src/ol/layer/Tile.js';
-import _ol_source_BingMaps_ from '../src/ol/source/BingMaps.js';
+import BingMaps from '../src/ol/source/BingMaps.js';
 
 
 var map = new Map({
@@ -17,7 +17,7 @@ var map = new Map({
   ]),
   layers: [
     new TileLayer({
-      source: new _ol_source_BingMaps_({
+      source: new BingMaps({
         key: 'As1HiMj1PvLPlqc_gtM7AqZfBL8ZL3VrjaS3zIb22Uvb9WKhuJObROC-qUpa81U5',
         imagerySet: 'Aerial'
       })
@@ -25,7 +25,7 @@ var map = new Map({
   ],
   // Use the canvas renderer because it's currently the fastest
   target: 'map',
-  view: new _ol_View_({
+  view: new View({
     center: [-33519607, 5616436],
     rotation: -Math.PI / 8,
     zoom: 8

examples/full-screen-source.js

@@ -1,12 +1,12 @@
 import Map from '../src/ol/Map.js';
-import _ol_View_ from '../src/ol/View.js';
+import View from '../src/ol/View.js';
 import {defaults as defaultControls} from '../src/ol/control.js';
 import FullScreen from '../src/ol/control/FullScreen.js';
 import TileLayer from '../src/ol/layer/Tile.js';
-import _ol_source_OSM_ from '../src/ol/source/OSM.js';
+import OSM from '../src/ol/source/OSM.js';
 
 
-var view = new _ol_View_({
+var view = new View({
   center: [-9101767, 2822912],
   zoom: 14
 });
@@ -19,7 +19,7 @@ var map = new Map({
   ]),
   layers: [
     new TileLayer({
-      source: new _ol_source_OSM_()
+      source: new OSM()
     })
   ],
   target: 'map',

examples/full-screen.js

@@ -1,12 +1,12 @@
 import Map from '../src/ol/Map.js';
-import _ol_View_ from '../src/ol/View.js';
+import View from '../src/ol/View.js';
 import {defaults as defaultControls} from '../src/ol/control.js';
 import FullScreen from '../src/ol/control/FullScreen.js';
 import TileLayer from '../src/ol/layer/Tile.js';
-import _ol_source_BingMaps_ from '../src/ol/source/BingMaps.js';
+import BingMaps from '../src/ol/source/BingMaps.js';
 
 
-var view = new _ol_View_({
+var view = new View({
   center: [-9101767, 2822912],
   zoom: 14
 });
@@ -17,7 +17,7 @@ var map = new Map({
   ]),
   layers: [
     new TileLayer({
-      source: new _ol_source_BingMaps_({
+      source: new BingMaps({
         key: 'As1HiMj1PvLPlqc_gtM7AqZfBL8ZL3VrjaS3zIb22Uvb9WKhuJObROC-qUpa81U5',
         imagerySet: 'Aerial'
       })

examples/geojson-vt.js

@@ -1,9 +1,9 @@
 // NOCOMPILE
 import Map from '../src/ol/Map.js';
-import _ol_View_ from '../src/ol/View.js';
+import View from '../src/ol/View.js';
 import GeoJSON from '../src/ol/format/GeoJSON.js';
-import _ol_source_OSM_ from '../src/ol/source/OSM.js';
+import OSM from '../src/ol/source/OSM.js';
-import _ol_source_VectorTile_ from '../src/ol/source/VectorTile.js';
+import VectorTileSource from '../src/ol/source/VectorTile.js';
 import TileLayer from '../src/ol/layer/Tile.js';
 import _ol_layer_VectorTile_ from '../src/ol/layer/VectorTile.js';
 import _ol_proj_Projection_ from '../src/ol/proj/Projection.js';
@@ -56,11 +56,11 @@ var tilePixels = new _ol_proj_Projection_({
 var map = new Map({
   layers: [
     new TileLayer({
-      source: new _ol_source_OSM_()
+      source: new OSM()
     })
   ],
   target: 'map',
-  view: new _ol_View_({
+  view: new View({
     center: [0, 0],
     zoom: 2
   })
@@ -74,7 +74,7 @@ fetch(url).then(function(response) {
     extent: 4096,
     debug: 1
   });
-  var vectorSource = new _ol_source_VectorTile_({
+  var vectorSource = new VectorTileSource({
     format: new GeoJSON(),
     tileLoadFunction: function(tile) {
       var format = tile.getFormat();

examples/geojson.js

@@ -1,13 +1,13 @@
-import _ol_Feature_ from '../src/ol/Feature.js';
+import Feature from '../src/ol/Feature.js';
 import Map from '../src/ol/Map.js';
-import _ol_View_ from '../src/ol/View.js';
+import View from '../src/ol/View.js';
 import {defaults as defaultControls} from '../src/ol/control.js';
 import GeoJSON from '../src/ol/format/GeoJSON.js';
 import Circle from '../src/ol/geom/Circle.js';
 import TileLayer from '../src/ol/layer/Tile.js';
-import _ol_layer_Vector_ 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 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_Fill_ from '../src/ol/style/Fill.js';
 import _ol_style_Stroke_ from '../src/ol/style/Stroke.js';
@@ -160,13 +160,13 @@ var geojsonObject = {
   }]
 };
 
-var vectorSource = new _ol_source_Vector_({
+var vectorSource = new VectorSource({
   features: (new GeoJSON()).readFeatures(geojsonObject)
 });
 
-vectorSource.addFeature(new _ol_Feature_(new Circle([5e6, 7e6], 1e6)));
+vectorSource.addFeature(new Feature(new Circle([5e6, 7e6], 1e6)));
 
-var vectorLayer = new _ol_layer_Vector_({
+var vectorLayer = new VectorLayer({
   source: vectorSource,
   style: styleFunction
 });
@@ -174,7 +174,7 @@ var vectorLayer = new _ol_layer_Vector_({
 var map = new Map({
   layers: [
     new TileLayer({
-      source: new _ol_source_OSM_()
+      source: new OSM()
     }),
     vectorLayer
   ],
@@ -184,7 +184,7 @@ var map = new Map({
       collapsible: false
     }
   }),
-  view: new _ol_View_({
+  view: new View({
     center: [0, 0],
     zoom: 2
   })

examples/geolocation-orientation.js

@@ -1,15 +1,15 @@
 import Geolocation from '../src/ol/Geolocation.js';
 import Map from '../src/ol/Map.js';
 import _ol_Overlay_ from '../src/ol/Overlay.js';
-import _ol_View_ from '../src/ol/View.js';
+import View from '../src/ol/View.js';
 import {defaults as defaultControls} from '../src/ol/control.js';
 import LineString from '../src/ol/geom/LineString.js';
 import TileLayer from '../src/ol/layer/Tile.js';
 import {fromLonLat} from '../src/ol/proj.js';
-import _ol_source_OSM_ from '../src/ol/source/OSM.js';
+import OSM from '../src/ol/source/OSM.js';
 
 // creating the view
-var view = new _ol_View_({
+var view = new View({
   center: fromLonLat([5.8713, 45.6452]),
   zoom: 19
 });
@@ -18,7 +18,7 @@ var view = new _ol_View_({
 var map = new Map({
   layers: [
     new TileLayer({
-      source: new _ol_source_OSM_()
+      source: new OSM()
     })
   ],
   target: 'map',

examples/geolocation.js

@@ -1,19 +1,19 @@
-import _ol_Feature_ from '../src/ol/Feature.js';
+import Feature from '../src/ol/Feature.js';
 import Geolocation from '../src/ol/Geolocation.js';
 import Map from '../src/ol/Map.js';
-import _ol_View_ from '../src/ol/View.js';
+import View from '../src/ol/View.js';
 import {defaults as defaultControls} from '../src/ol/control.js';
 import Point from '../src/ol/geom/Point.js';
 import TileLayer from '../src/ol/layer/Tile.js';
-import _ol_layer_Vector_ 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 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_Fill_ from '../src/ol/style/Fill.js';
 import _ol_style_Stroke_ from '../src/ol/style/Stroke.js';
 import _ol_style_Style_ from '../src/ol/style/Style.js';
 
-var view = new _ol_View_({
+var view = new View({
   center: [0, 0],
   zoom: 2
 });
@@ -21,7 +21,7 @@ var view = new _ol_View_({
 var map = new Map({
   layers: [
     new TileLayer({
-      source: new _ol_source_OSM_()
+      source: new OSM()
     })
   ],
   target: 'map',
@@ -61,12 +61,12 @@ geolocation.on('error', function(error) {
   info.style.display = '';
 });
 
-var accuracyFeature = new _ol_Feature_();
+var accuracyFeature = new Feature();
 geolocation.on('change:accuracyGeometry', function() {
   accuracyFeature.setGeometry(geolocation.getAccuracyGeometry());
 });
 
-var positionFeature = new _ol_Feature_();
+var positionFeature = new Feature();
 positionFeature.setStyle(new _ol_style_Style_({
   image: new _ol_style_Circle_({
     radius: 6,
@@ -86,9 +86,9 @@ geolocation.on('change:position', function() {
     new Point(coordinates) : null);
 });
 
-new _ol_layer_Vector_({
+new VectorLayer({
   map: map,
-  source: new _ol_source_Vector_({
+  source: new VectorSource({
     features: [accuracyFeature, positionFeature]
   })
 });

examples/getfeatureinfo-image.js

@@ -1,21 +1,21 @@
 import Map from '../src/ol/Map.js';
-import _ol_View_ from '../src/ol/View.js';
+import View from '../src/ol/View.js';
-import _ol_layer_Image_ from '../src/ol/layer/Image.js';
+import ImageLayer from '../src/ol/layer/Image.js';
-import _ol_source_ImageWMS_ from '../src/ol/source/ImageWMS.js';
+import ImageWMS from '../src/ol/source/ImageWMS.js';
 
 
-var wmsSource = new _ol_source_ImageWMS_({
+var wmsSource = new ImageWMS({
   url: 'https://ahocevar.com/geoserver/wms',
   params: {'LAYERS': 'ne:ne'},
   serverType: 'geoserver',
   crossOrigin: 'anonymous'
 });
 
-var wmsLayer = new _ol_layer_Image_({
+var wmsLayer = new ImageLayer({
   source: wmsSource
 });
 
-var view = new _ol_View_({
+var view = new View({
   center: [0, 0],
   zoom: 1
 });

examples/getfeatureinfo-tile.js

@@ -1,10 +1,10 @@
 import Map from '../src/ol/Map.js';
-import _ol_View_ from '../src/ol/View.js';
+import View from '../src/ol/View.js';
 import TileLayer from '../src/ol/layer/Tile.js';
-import _ol_source_TileWMS_ from '../src/ol/source/TileWMS.js';
+import TileWMS from '../src/ol/source/TileWMS.js';
 
 
-var wmsSource = new _ol_source_TileWMS_({
+var wmsSource = new TileWMS({
   url: 'https://ahocevar.com/geoserver/wms',
   params: {'LAYERS': 'ne:ne', 'TILED': true},
   serverType: 'geoserver',
@@ -15,7 +15,7 @@ var wmsLayer = new TileLayer({
   source: wmsSource
 });
 
-var view = new _ol_View_({
+var view = new View({
   center: [0, 0],
   zoom: 1
 });

examples/gpx.js

@@ -1,17 +1,17 @@
 import Map from '../src/ol/Map.js';
-import _ol_View_ from '../src/ol/View.js';
+import View from '../src/ol/View.js';
 import GPX from '../src/ol/format/GPX.js';
 import TileLayer from '../src/ol/layer/Tile.js';
-import _ol_layer_Vector_ 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 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_Fill_ from '../src/ol/style/Fill.js';
 import _ol_style_Stroke_ from '../src/ol/style/Stroke.js';
 import _ol_style_Style_ from '../src/ol/style/Style.js';
 
 var raster = new TileLayer({
-  source: new _ol_source_BingMaps_({
+  source: new BingMaps({
     imagerySet: 'Aerial',
     key: 'As1HiMj1PvLPlqc_gtM7AqZfBL8ZL3VrjaS3zIb22Uvb9WKhuJObROC-qUpa81U5'
   })
@@ -44,8 +44,8 @@ var style = {
   })
 };
 
-var vector = new _ol_layer_Vector_({
+var vector = new VectorLayer({
-  source: new _ol_source_Vector_({
+  source: new VectorSource({
     url: 'data/gpx/fells_loop.gpx',
     format: new GPX()
   }),
@@ -57,7 +57,7 @@ var vector = new _ol_layer_Vector_({
 var map = new Map({
   layers: [raster, vector],
   target: document.getElementById('map'),
-  view: new _ol_View_({
+  view: new View({
     center: [-7916041.528716288, 5228379.045749711],
     zoom: 12
   })

examples/graticule.js

@@ -1,22 +1,22 @@
 import Graticule from '../src/ol/Graticule.js';
 import Map from '../src/ol/Map.js';
-import _ol_View_ from '../src/ol/View.js';
+import View from '../src/ol/View.js';
 import TileLayer from '../src/ol/layer/Tile.js';
 import {fromLonLat} from '../src/ol/proj.js';
-import _ol_source_OSM_ from '../src/ol/source/OSM.js';
+import OSM from '../src/ol/source/OSM.js';
 import _ol_style_Stroke_ from '../src/ol/style/Stroke.js';
 
 
 var map = new Map({
   layers: [
     new TileLayer({
-      source: new _ol_source_OSM_({
+      source: new OSM({
         wrapX: false
       })
     })
   ],
   target: 'map',
-  view: new _ol_View_({
+  view: new View({
     center: fromLonLat([4.8, 47.75]),
     zoom: 5
   })

examples/heatmap-earthquakes.js

@@ -1,16 +1,16 @@
 import Map from '../src/ol/Map.js';
-import _ol_View_ from '../src/ol/View.js';
+import View from '../src/ol/View.js';
 import KML from '../src/ol/format/KML.js';
 import HeatmapLayer from '../src/ol/layer/Heatmap.js';
 import TileLayer from '../src/ol/layer/Tile.js';
-import _ol_source_Stamen_ from '../src/ol/source/Stamen.js';
+import 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 radius = document.getElementById('radius');
 
 var vector = new HeatmapLayer({
-  source: new _ol_source_Vector_({
+  source: new VectorSource({
     url: 'data/kml/2012_Earthquakes_Mag5.kml',
     format: new KML({
       extractStyles: false
@@ -30,7 +30,7 @@ vector.getSource().on('addfeature', function(event) {
 });
 
 var raster = new TileLayer({
-  source: new _ol_source_Stamen_({
+  source: new Stamen({
     layer: 'toner'
   })
 });
@@ -38,7 +38,7 @@ var raster = new TileLayer({
 var map = new Map({
   layers: [raster, vector],
   target: 'map',
-  view: new _ol_View_({
+  view: new View({
     center: [0, 0],
     zoom: 2
   })

examples/here-maps.js

@@ -1,7 +1,7 @@
 import Map from '../src/ol/Map.js';
-import _ol_View_ from '../src/ol/View.js';
+import View from '../src/ol/View.js';
 import TileLayer from '../src/ol/layer/Tile.js';
-import _ol_source_XYZ_ from '../src/ol/source/XYZ.js';
+import XYZ from '../src/ol/source/XYZ.js';
 
 var appId = 'kDm0Jq1K4Ak7Bwtn8uvk';
 var appCode = 'xnmvc4dKZrDfGlvQHXSvwQ';
@@ -59,7 +59,7 @@ for (i = 0, ii = hereLayers.length; i < ii; ++i) {
   layers.push(new TileLayer({
     visible: false,
     preload: Infinity,
-    source: new _ol_source_XYZ_({
+    source: new XYZ({
       url: createUrl(urlTpl, layerDesc),
       attributions: 'Map Tiles &copy; ' + new Date().getFullYear() + ' ' +
         '<a href="http://developer.here.com">HERE</a>'
@@ -73,7 +73,7 @@ var map = new Map({
   // zooming choppy on mobile or slow devices.
   loadTilesWhileInteracting: true,
   target: 'map',
-  view: new _ol_View_({
+  view: new View({
     center: [921371.9389, 6358337.7609],
     zoom: 10
   })

examples/hit-tolerance.js

@@ -1,16 +1,16 @@
 import Map from '../src/ol/Map.js';
-import _ol_View_ from '../src/ol/View.js';
+import View from '../src/ol/View.js';
 import TileLayer from '../src/ol/layer/Tile.js';
-import _ol_layer_Vector_ 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 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_Feature_ from '../src/ol/Feature.js';
+import Feature from '../src/ol/Feature.js';
 import LineString from '../src/ol/geom/LineString.js';
 import _ol_style_Style_ from '../src/ol/style/Style.js';
 import _ol_style_Stroke_ from '../src/ol/style/Stroke.js';
 
 var raster = new TileLayer({
-  source: new _ol_source_OSM_()
+  source: new OSM()
 });
 
 var style = new _ol_style_Style_({
@@ -20,10 +20,10 @@ var style = new _ol_style_Style_({
   })
 });
 
-var feature = new _ol_Feature_(new LineString([[-4000000, 0], [4000000, 0]]));
+var feature = new Feature(new LineString([[-4000000, 0], [4000000, 0]]));
 
-var vector = new _ol_layer_Vector_({
+var vector = new VectorLayer({
-  source: new _ol_source_Vector_({
+  source: new VectorSource({
     features: [feature]
   }),
   style: style
@@ -32,7 +32,7 @@ var vector = new _ol_layer_Vector_({
 var map = new Map({
   layers: [raster, vector],
   target: 'map',
-  view: new _ol_View_({
+  view: new View({
     center: [0, 0],
     zoom: 2
   })

examples/icon-color.js

@@ -1,25 +1,25 @@
-import _ol_Feature_ from '../src/ol/Feature.js';
+import Feature from '../src/ol/Feature.js';
 import Map from '../src/ol/Map.js';
-import _ol_View_ from '../src/ol/View.js';
+import View from '../src/ol/View.js';
 import Point from '../src/ol/geom/Point.js';
 import TileLayer from '../src/ol/layer/Tile.js';
-import _ol_layer_Vector_ from '../src/ol/layer/Vector.js';
+import VectorLayer from '../src/ol/layer/Vector.js';
 import {fromLonLat} from '../src/ol/proj.js';
-import _ol_source_TileJSON_ from '../src/ol/source/TileJSON.js';
+import 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_Style_ from '../src/ol/style/Style.js';
 
 
-var rome = new _ol_Feature_({
+var rome = new Feature({
   geometry: new Point(fromLonLat([12.5, 41.9]))
 });
 
-var london = new _ol_Feature_({
+var london = new Feature({
   geometry: new Point(fromLonLat([-0.12755, 51.507222]))
 });
 
-var madrid = new _ol_Feature_({
+var madrid = new Feature({
   geometry: new Point(fromLonLat([-3.683333, 40.4]))
 });
 
@@ -48,16 +48,16 @@ madrid.setStyle(new _ol_style_Style_({
 }));
 
 
-var vectorSource = new _ol_source_Vector_({
+var vectorSource = new VectorSource({
   features: [rome, london, madrid]
 });
 
-var vectorLayer = new _ol_layer_Vector_({
+var vectorLayer = new VectorLayer({
   source: vectorSource
 });
 
 var rasterLayer = new TileLayer({
-  source: new _ol_source_TileJSON_({
+  source: new TileJSON({
     url: 'https://api.tiles.mapbox.com/v3/mapbox.geography-class.json?secure',
     crossOrigin: ''
   })
@@ -66,7 +66,7 @@ var rasterLayer = new TileLayer({
 var map = new Map({
   layers: [rasterLayer, vectorLayer],
   target: document.getElementById('map'),
-  view: new _ol_View_({
+  view: new View({
     center: fromLonLat([2.896372, 44.60240]),
     zoom: 3
   })

examples/icon-negative.js

@@ -1,12 +1,12 @@
-import _ol_Feature_ from '../src/ol/Feature.js';
+import Feature from '../src/ol/Feature.js';
 import Map from '../src/ol/Map.js';
-import _ol_View_ from '../src/ol/View.js';
+import View from '../src/ol/View.js';
 import Point from '../src/ol/geom/Point.js';
 import _ol_interaction_Select_ from '../src/ol/interaction/Select.js';
 import TileLayer from '../src/ol/layer/Tile.js';
-import _ol_layer_Vector_ 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 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_Style_ from '../src/ol/style/Style.js';
 
@@ -23,23 +23,23 @@ function createStyle(src, img) {
   });
 }
 
-var iconFeature = new _ol_Feature_(new Point([0, 0]));
+var iconFeature = new Feature(new Point([0, 0]));
 iconFeature.set('style', createStyle('data/icon.png', undefined));
 
 var map = new Map({
   layers: [
     new TileLayer({
-      source: new _ol_source_Stamen_({layer: 'watercolor'})
+      source: new Stamen({layer: 'watercolor'})
     }),
-    new _ol_layer_Vector_({
+    new VectorLayer({
       style: function(feature) {
         return feature.get('style');
       },
-      source: new _ol_source_Vector_({features: [iconFeature]})
+      source: new VectorSource({features: [iconFeature]})
     })
   ],
   target: document.getElementById('map'),
-  view: new _ol_View_({
+  view: new View({
     center: [0, 0],
     zoom: 3
   })

examples/icon-sprite-webgl.js

@@ -1,9 +1,9 @@
-import _ol_Feature_ from '../src/ol/Feature.js';
+import Feature from '../src/ol/Feature.js';
 import Map from '../src/ol/Map.js';
-import _ol_View_ from '../src/ol/View.js';
+import View from '../src/ol/View.js';
 import Point from '../src/ol/geom/Point.js';
-import _ol_layer_Vector_ 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_Style_ from '../src/ol/style/Style.js';
 
@@ -63,7 +63,7 @@ var e = 25000000;
 for (i = 0; i < featureCount; ++i) {
   geometry = new Point(
       [2 * e * Math.random() - e, 2 * e * Math.random() - e]);
-  feature = new _ol_Feature_(geometry);
+  feature = new Feature(geometry);
   feature.setStyle(
       new _ol_style_Style_({
         image: icons[i % (iconCount - 1)]
@@ -72,10 +72,10 @@ for (i = 0; i < featureCount; ++i) {
   features[i] = feature;
 }
 
-var vectorSource = new _ol_source_Vector_({
+var vectorSource = new VectorSource({
   features: features
 });
-var vector = new _ol_layer_Vector_({
+var vector = new VectorLayer({
   source: vectorSource
 });
 
@@ -83,7 +83,7 @@ var map = new Map({
   renderer: /** @type {Array<ol.renderer.Type>} */ (['webgl', 'canvas']),
   layers: [vector],
   target: document.getElementById('map'),
-  view: new _ol_View_({
+  view: new View({
     center: [0, 0],
     zoom: 5
   })
@@ -96,9 +96,9 @@ for (i = 0; i < featureCount; i += 30) {
   overlayFeatures.push(clone);
 }
 
-new _ol_layer_Vector_({
+new VectorLayer({
   map: map,
-  source: new _ol_source_Vector_({
+  source: new VectorSource({
     features: overlayFeatures
   }),
   style: new _ol_style_Style_({

examples/icon.js

@@ -1,17 +1,17 @@
-import _ol_Feature_ from '../src/ol/Feature.js';
+import Feature from '../src/ol/Feature.js';
 import Map from '../src/ol/Map.js';
 import _ol_Overlay_ from '../src/ol/Overlay.js';
-import _ol_View_ from '../src/ol/View.js';
+import View from '../src/ol/View.js';
 import Point from '../src/ol/geom/Point.js';
 import TileLayer from '../src/ol/layer/Tile.js';
-import _ol_layer_Vector_ 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 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_Style_ from '../src/ol/style/Style.js';
 
 
-var iconFeature = new _ol_Feature_({
+var iconFeature = new Feature({
   geometry: new Point([0, 0]),
   name: 'Null Island',
   population: 4000,
@@ -29,16 +29,16 @@ var iconStyle = new _ol_style_Style_({
 
 iconFeature.setStyle(iconStyle);
 
-var vectorSource = new _ol_source_Vector_({
+var vectorSource = new VectorSource({
   features: [iconFeature]
 });
 
-var vectorLayer = new _ol_layer_Vector_({
+var vectorLayer = new VectorLayer({
   source: vectorSource
 });
 
 var rasterLayer = new TileLayer({
-  source: new _ol_source_TileJSON_({
+  source: new TileJSON({
     url: 'https://api.tiles.mapbox.com/v3/mapbox.geography-class.json?secure',
     crossOrigin: ''
   })
@@ -47,7 +47,7 @@ var rasterLayer = new TileLayer({
 var map = new Map({
   layers: [rasterLayer, vectorLayer],
   target: document.getElementById('map'),
-  view: new _ol_View_({
+  view: new View({
     center: [0, 0],
     zoom: 3
   })

examples/igc.js

@@ -1,14 +1,14 @@
-import _ol_Feature_ from '../src/ol/Feature.js';
+import Feature from '../src/ol/Feature.js';
 import Map from '../src/ol/Map.js';
-import _ol_View_ from '../src/ol/View.js';
+import View from '../src/ol/View.js';
 import {defaults as defaultControls} from '../src/ol/control.js';
 import IGC from '../src/ol/format/IGC.js';
 import LineString from '../src/ol/geom/LineString.js';
 import Point from '../src/ol/geom/Point.js';
 import TileLayer from '../src/ol/layer/Tile.js';
-import _ol_layer_Vector_ 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 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_Fill_ from '../src/ol/style/Fill.js';
 import _ol_style_Stroke_ from '../src/ol/style/Stroke.js';
@@ -39,7 +39,7 @@ var styleFunction = function(feature) {
   return style;
 };
 
-var vectorSource = new _ol_source_Vector_();
+var vectorSource = new VectorSource();
 
 var igcUrls = [
   'data/igc/Clement-Latour.igc',
@@ -83,16 +83,16 @@ vectorSource.on('addfeature', function(event) {
 var map = new Map({
   layers: [
     new TileLayer({
-      source: new _ol_source_OSM_({
+      source: new OSM({
         attributions: [
           'All maps © <a href="https://www.opencyclemap.org/">OpenCycleMap</a>',
-          _ol_source_OSM_.ATTRIBUTION
+          OSM.ATTRIBUTION
         ],
         url: 'https://{a-c}.tile.thunderforest.com/cycle/{z}/{x}/{y}.png' +
             '?apikey=0e6fc415256d4fbb9b5166a718591d71'
       })
     }),
-    new _ol_layer_Vector_({
+    new VectorLayer({
       source: vectorSource,
       style: styleFunction
     })
@@ -103,7 +103,7 @@ var map = new Map({
       collapsible: false
     }
   }),
-  view: new _ol_View_({
+  view: new View({
     center: [703365.7089403362, 5714629.865071137],
     zoom: 9
   })
@@ -175,8 +175,8 @@ map.on('postcompose', function(evt) {
   }
 });
 
-var featureOverlay = new _ol_layer_Vector_({
+var featureOverlay = new VectorLayer({
-  source: new _ol_source_Vector_(),
+  source: new VectorSource(),
   map: map,
   style: new _ol_style_Style_({
     image: new _ol_style_Circle_({
@@ -196,7 +196,7 @@ document.getElementById('time').addEventListener('input', function() {
     var coordinate = geometry.getCoordinateAtM(m, true);
     var highlight = feature.get('highlight');
     if (highlight === undefined) {
-      highlight = new _ol_Feature_(new Point(coordinate));
+      highlight = new Feature(new Point(coordinate));
       feature.set('highlight', highlight);
       featureOverlay.getSource().addFeature(highlight);
     } else {

examples/image-filter.js

@@ -1,19 +1,19 @@
 import Map from '../src/ol/Map.js';
-import _ol_View_ from '../src/ol/View.js';
+import View from '../src/ol/View.js';
 import TileLayer from '../src/ol/layer/Tile.js';
 import {fromLonLat} from '../src/ol/proj.js';
-import _ol_source_BingMaps_ from '../src/ol/source/BingMaps.js';
+import BingMaps from '../src/ol/source/BingMaps.js';
 
 var key = 'As1HiMj1PvLPlqc_gtM7AqZfBL8ZL3VrjaS3zIb22Uvb9WKhuJObROC-qUpa81U5';
 
 var imagery = new TileLayer({
-  source: new _ol_source_BingMaps_({key: key, imagerySet: 'Aerial'})
+  source: new BingMaps({key: key, imagerySet: 'Aerial'})
 });
 
 var map = new Map({
   layers: [imagery],
   target: 'map',
-  view: new _ol_View_({
+  view: new View({
     center: fromLonLat([-120, 50]),
     zoom: 6
   })

examples/image-load-events.js

@@ -1,7 +1,7 @@
 import Map from '../src/ol/Map.js';
-import _ol_View_ from '../src/ol/View.js';
+import View from '../src/ol/View.js';
-import _ol_layer_Image_ from '../src/ol/layer/Image.js';
+import ImageLayer from '../src/ol/layer/Image.js';
-import _ol_source_ImageWMS_ from '../src/ol/source/ImageWMS.js';
+import ImageWMS from '../src/ol/source/ImageWMS.js';
 
 
 /**
@@ -77,7 +77,7 @@ Progress.prototype.hide = function() {
 
 var progress = new Progress(document.getElementById('progress'));
 
-var source = new _ol_source_ImageWMS_({
+var source = new ImageWMS({
   url: 'https://ahocevar.com/geoserver/wms',
   params: {'LAYERS': 'topp:states'},
   serverType: 'geoserver'
@@ -96,10 +96,10 @@ source.on('imageloaderror', function() {
 
 var map = new Map({
   layers: [
-    new _ol_layer_Image_({source: source})
+    new ImageLayer({source: source})
   ],
   target: 'map',
-  view: new _ol_View_({
+  view: new View({
     center: [-10997148, 4569099],
     zoom: 4
   })

examples/image-vector-layer.js

@@ -1,8 +1,8 @@
 import Map from '../src/ol/Map.js';
-import _ol_View_ from '../src/ol/View.js';
+import View from '../src/ol/View.js';
 import GeoJSON from '../src/ol/format/GeoJSON.js';
-import _ol_layer_Vector_ 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_Stroke_ from '../src/ol/style/Stroke.js';
 import _ol_style_Style_ from '../src/ol/style/Style.js';
@@ -22,9 +22,9 @@ var style = new _ol_style_Style_({
 
 var map = new Map({
   layers: [
-    new _ol_layer_Vector_({
+    new VectorLayer({
       renderMode: 'image',
-      source: new _ol_source_Vector_({
+      source: new VectorSource({
         url: 'data/geojson/countries.geojson',
         format: new GeoJSON()
       }),
@@ -35,14 +35,14 @@ var map = new Map({
     })
   ],
   target: 'map',
-  view: new _ol_View_({
+  view: new View({
     center: [0, 0],
     zoom: 1
   })
 });
 
-var featureOverlay = new _ol_layer_Vector_({
+var featureOverlay = new VectorLayer({
-  source: new _ol_source_Vector_(),
+  source: new VectorSource(),
   map: map,
   style: new _ol_style_Style_({
     stroke: new _ol_style_Stroke_({

examples/jsts.js

@@ -1,16 +1,16 @@
 // NOCOMPILE
 // this example uses JSTS for which we don't have an externs file.
 import Map from '../src/ol/Map.js';
-import _ol_View_ from '../src/ol/View.js';
+import View from '../src/ol/View.js';
 import GeoJSON from '../src/ol/format/GeoJSON.js';
 import TileLayer from '../src/ol/layer/Tile.js';
-import _ol_layer_Vector_ from '../src/ol/layer/Vector.js';
+import VectorLayer from '../src/ol/layer/Vector.js';
 import {fromLonLat} from '../src/ol/proj.js';
-import _ol_source_OSM_ from '../src/ol/source/OSM.js';
+import 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) {
   return response.json();
 }).then(function(json) {
@@ -33,18 +33,18 @@ fetch('data/geojson/roads-seoul.geojson').then(function(response) {
 
   source.addFeatures(features);
 });
-var vectorLayer = new _ol_layer_Vector_({
+var vectorLayer = new VectorLayer({
   source: source
 });
 
 var rasterLayer = new TileLayer({
-  source: new _ol_source_OSM_()
+  source: new OSM()
 });
 
 var map = new Map({
   layers: [rasterLayer, vectorLayer],
   target: document.getElementById('map'),
-  view: new _ol_View_({
+  view: new View({
     center: fromLonLat([126.979293, 37.528787]),
     zoom: 15
   })

examples/kml-earthquakes.js

@@ -1,10 +1,10 @@
 import Map from '../src/ol/Map.js';
-import _ol_View_ from '../src/ol/View.js';
+import View from '../src/ol/View.js';
 import KML from '../src/ol/format/KML.js';
 import TileLayer from '../src/ol/layer/Tile.js';
-import _ol_layer_Vector_ 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 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_Fill_ from '../src/ol/style/Fill.js';
 import _ol_style_Stroke_ from '../src/ol/style/Stroke.js';
@@ -38,8 +38,8 @@ var styleFunction = function(feature) {
   return style;
 };
 
-var vector = new _ol_layer_Vector_({
+var vector = new VectorLayer({
-  source: new _ol_source_Vector_({
+  source: new VectorSource({
     url: 'data/kml/2012_Earthquakes_Mag5.kml',
     format: new KML({
       extractStyles: false
@@ -49,7 +49,7 @@ var vector = new _ol_layer_Vector_({
 });
 
 var raster = new TileLayer({
-  source: new _ol_source_Stamen_({
+  source: new Stamen({
     layer: 'toner'
   })
 });
@@ -57,7 +57,7 @@ var raster = new TileLayer({
 var map = new Map({
   layers: [raster, vector],
   target: 'map',
-  view: new _ol_View_({
+  view: new View({
     center: [0, 0],
     zoom: 2
   })

examples/kml-timezones.js

@@ -1,10 +1,10 @@
 import Map from '../src/ol/Map.js';
-import _ol_View_ from '../src/ol/View.js';
+import View from '../src/ol/View.js';
 import KML from '../src/ol/format/KML.js';
 import TileLayer from '../src/ol/layer/Tile.js';
-import _ol_layer_Vector_ 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 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_Stroke_ from '../src/ol/style/Stroke.js';
 import _ol_style_Style_ from '../src/ol/style/Style.js';
@@ -45,8 +45,8 @@ var styleFunction = function(feature) {
   });
 };
 
-var vector = new _ol_layer_Vector_({
+var vector = new VectorLayer({
-  source: new _ol_source_Vector_({
+  source: new VectorSource({
     url: 'data/kml/timezones.kml',
     format: new KML({
       extractStyles: false
@@ -56,7 +56,7 @@ var vector = new _ol_layer_Vector_({
 });
 
 var raster = new TileLayer({
-  source: new _ol_source_Stamen_({
+  source: new Stamen({
     layer: 'toner'
   })
 });
@@ -64,7 +64,7 @@ var raster = new TileLayer({
 var map = new Map({
   layers: [raster, vector],
   target: 'map',
-  view: new _ol_View_({
+  view: new View({
     center: [0, 0],
     zoom: 2
   })

examples/kml.js

@@ -1,20 +1,20 @@
 import Map from '../src/ol/Map.js';
-import _ol_View_ from '../src/ol/View.js';
+import View from '../src/ol/View.js';
 import KML from '../src/ol/format/KML.js';
 import TileLayer from '../src/ol/layer/Tile.js';
-import _ol_layer_Vector_ 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 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({
-  source: new _ol_source_BingMaps_({
+  source: new BingMaps({
     imagerySet: 'Aerial',
     key: 'As1HiMj1PvLPlqc_gtM7AqZfBL8ZL3VrjaS3zIb22Uvb9WKhuJObROC-qUpa81U5'
   })
 });
 
-var vector = new _ol_layer_Vector_({
+var vector = new VectorLayer({
-  source: new _ol_source_Vector_({
+  source: new VectorSource({
     url: 'data/kml/2012-02-10.kml',
     format: new KML()
   })
@@ -23,7 +23,7 @@ var vector = new _ol_layer_Vector_({
 var map = new Map({
   layers: [raster, vector],
   target: document.getElementById('map'),
-  view: new _ol_View_({
+  view: new View({
     center: [876970.8463461736, 5859807.853963373],
     projection: 'EPSG:3857',
     zoom: 10

examples/layer-clipping-webgl.js

@@ -1,9 +1,9 @@
 import Map from '../src/ol/Map.js';
-import _ol_View_ from '../src/ol/View.js';
+import View from '../src/ol/View.js';
 import {defaults as defaultControls} from '../src/ol/control.js';
 import _ol_has_ from '../src/ol/has.js';
 import TileLayer from '../src/ol/layer/Tile.js';
-import _ol_source_OSM_ from '../src/ol/source/OSM.js';
+import OSM from '../src/ol/source/OSM.js';
 
 if (!_ol_has_.WEBGL) {
   var info = document.getElementById('no-webgl');
@@ -14,7 +14,7 @@ if (!_ol_has_.WEBGL) {
 } else {
 
   var osm = new TileLayer({
-    source: new _ol_source_OSM_()
+    source: new OSM()
   });
 
   var map = new Map({
@@ -26,7 +26,7 @@ if (!_ol_has_.WEBGL) {
         collapsible: false
       }
     }),
-    view: new _ol_View_({
+    view: new View({
       center: [0, 0],
       zoom: 2
     })

examples/layer-clipping.js

@@ -1,11 +1,11 @@
 import Map from '../src/ol/Map.js';
-import _ol_View_ from '../src/ol/View.js';
+import View from '../src/ol/View.js';
 import {defaults as defaultControls} from '../src/ol/control.js';
 import TileLayer from '../src/ol/layer/Tile.js';
-import _ol_source_OSM_ from '../src/ol/source/OSM.js';
+import OSM from '../src/ol/source/OSM.js';
 
 var osm = new TileLayer({
-  source: new _ol_source_OSM_()
+  source: new OSM()
 });
 
 var map = new Map({
@@ -16,7 +16,7 @@ var map = new Map({
       collapsible: false
     }
   }),
-  view: new _ol_View_({
+  view: new View({
     center: [0, 0],
     zoom: 2
   })

examples/layer-extent.js

@@ -1,8 +1,8 @@
 import Map from '../src/ol/Map.js';
-import _ol_View_ from '../src/ol/View.js';
+import View from '../src/ol/View.js';
 import TileLayer from '../src/ol/layer/Tile.js';
 import {transformExtent} from '../src/ol/proj.js';
-import _ol_source_TileJSON_ from '../src/ol/source/TileJSON.js';
+import TileJSON from '../src/ol/source/TileJSON.js';
 
 function transform(extent) {
   return transformExtent(extent, 'EPSG:4326', 'EPSG:3857');
@@ -16,7 +16,7 @@ var extents = {
 };
 
 var base = new TileLayer({
-  source: new _ol_source_TileJSON_({
+  source: new TileJSON({
     url: 'https://api.tiles.mapbox.com/v3/mapbox.world-light.json?secure',
     crossOrigin: 'anonymous'
   })
@@ -24,7 +24,7 @@ var base = new TileLayer({
 
 var overlay = new TileLayer({
   extent: extents.India,
-  source: new _ol_source_TileJSON_({
+  source: new TileJSON({
     url: 'https://api.tiles.mapbox.com/v3/mapbox.world-black.json?secure',
     crossOrigin: 'anonymous'
   })
@@ -33,7 +33,7 @@ var overlay = new TileLayer({
 var map = new Map({
   layers: [base, overlay],
   target: 'map',
-  view: new _ol_View_({
+  view: new View({
     center: [0, 0],
     zoom: 1
   })

examples/layer-group.js

@@ -1,25 +1,25 @@
 import Map from '../src/ol/Map.js';
-import _ol_View_ from '../src/ol/View.js';
+import View from '../src/ol/View.js';
 import _ol_layer_Group_ from '../src/ol/layer/Group.js';
 import TileLayer from '../src/ol/layer/Tile.js';
 import {fromLonLat} from '../src/ol/proj.js';
-import _ol_source_OSM_ from '../src/ol/source/OSM.js';
+import OSM from '../src/ol/source/OSM.js';
-import _ol_source_TileJSON_ from '../src/ol/source/TileJSON.js';
+import TileJSON from '../src/ol/source/TileJSON.js';
 
 var map = new Map({
   layers: [
     new TileLayer({
-      source: new _ol_source_OSM_()
+      source: new OSM()
     }), new _ol_layer_Group_({
       layers: [
         new TileLayer({
-          source: new _ol_source_TileJSON_({
+          source: new TileJSON({
             url: 'https://api.tiles.mapbox.com/v3/mapbox.20110804-hoa-foodinsecurity-3month.json?secure',
             crossOrigin: 'anonymous'
           })
         }),
         new TileLayer({
-          source: new _ol_source_TileJSON_({
+          source: new TileJSON({
             url: 'https://api.tiles.mapbox.com/v3/mapbox.world-borders-light.json?secure',
             crossOrigin: 'anonymous'
           })
@@ -28,7 +28,7 @@ var map = new Map({
     })
   ],
   target: 'map',
-  view: new _ol_View_({
+  view: new View({
     center: fromLonLat([37.40570, 8.81566]),
     zoom: 4
   })

examples/layer-spy.js

@@ -1,17 +1,17 @@
 import Map from '../src/ol/Map.js';
-import _ol_View_ from '../src/ol/View.js';
+import View from '../src/ol/View.js';
 import TileLayer from '../src/ol/layer/Tile.js';
 import {fromLonLat} from '../src/ol/proj.js';
-import _ol_source_BingMaps_ from '../src/ol/source/BingMaps.js';
+import BingMaps from '../src/ol/source/BingMaps.js';
 
 var key = 'As1HiMj1PvLPlqc_gtM7AqZfBL8ZL3VrjaS3zIb22Uvb9WKhuJObROC-qUpa81U5';
 
 var roads = new TileLayer({
-  source: new _ol_source_BingMaps_({key: key, imagerySet: 'Road'})
+  source: new BingMaps({key: key, imagerySet: 'Road'})
 });
 
 var imagery = new TileLayer({
-  source: new _ol_source_BingMaps_({key: key, imagerySet: 'Aerial'})
+  source: new BingMaps({key: key, imagerySet: 'Aerial'})
 });
 
 var container = document.getElementById('map');
@@ -19,7 +19,7 @@ var container = document.getElementById('map');
 var map = new Map({
   layers: [roads, imagery],
   target: container,
-  view: new _ol_View_({
+  view: new View({
     center: fromLonLat([-109, 46.5]),
     zoom: 6
   })

examples/layer-swipe.js

@@ -1,15 +1,15 @@
 import Map from '../src/ol/Map.js';
-import _ol_View_ from '../src/ol/View.js';
+import View from '../src/ol/View.js';
 import {defaults as defaultControls} from '../src/ol/control.js';
 import TileLayer from '../src/ol/layer/Tile.js';
-import _ol_source_BingMaps_ from '../src/ol/source/BingMaps.js';
+import BingMaps from '../src/ol/source/BingMaps.js';
-import _ol_source_OSM_ from '../src/ol/source/OSM.js';
+import OSM from '../src/ol/source/OSM.js';
 
 var osm = new TileLayer({
-  source: new _ol_source_OSM_()
+  source: new OSM()
 });
 var bing = new TileLayer({
-  source: new _ol_source_BingMaps_({
+  source: new BingMaps({
     key: 'As1HiMj1PvLPlqc_gtM7AqZfBL8ZL3VrjaS3zIb22Uvb9WKhuJObROC-qUpa81U5',
     imagerySet: 'Aerial'
   })
@@ -23,7 +23,7 @@ var map = new Map({
       collapsible: false
     }
   }),
-  view: new _ol_View_({
+  view: new View({
     center: [0, 0],
     zoom: 2
   })

examples/layer-z-index.js

@@ -1,9 +1,9 @@
-import _ol_Feature_ from '../src/ol/Feature.js';
+import Feature from '../src/ol/Feature.js';
 import Map from '../src/ol/Map.js';
-import _ol_View_ from '../src/ol/View.js';
+import View from '../src/ol/View.js';
 import Point from '../src/ol/geom/Point.js';
-import _ol_layer_Vector_ 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_RegularShape_ from '../src/ol/style/RegularShape.js';
 import _ol_style_Stroke_ from '../src/ol/style/Stroke.js';
@@ -46,14 +46,14 @@ var styles = {
 
 
 function createLayer(coordinates, style, zIndex) {
-  var feature = new _ol_Feature_(new Point(coordinates));
+  var feature = new Feature(new Point(coordinates));
   feature.setStyle(style);
 
-  var source = new _ol_source_Vector_({
+  var source = new VectorSource({
     features: [feature]
   });
 
-  var vectorLayer = new _ol_layer_Vector_({
+  var vectorLayer = new VectorLayer({
     source: source
   });
   vectorLayer.setZIndex(zIndex);
@@ -72,7 +72,7 @@ layers.push(layer2);
 var map = new Map({
   layers: layers,
   target: 'map',
-  view: new _ol_View_({
+  view: new View({
     center: [0, 0],
     zoom: 18
   })

examples/lazy-source.js

@@ -1,16 +1,16 @@
 import Map from '../src/ol/Map.js';
-import _ol_View_ from '../src/ol/View.js';
+import View from '../src/ol/View.js';
 import TileLayer from '../src/ol/layer/Tile.js';
-import _ol_source_OSM_ from '../src/ol/source/OSM.js';
+import OSM from '../src/ol/source/OSM.js';
 
-var source = new _ol_source_OSM_();
+var source = new OSM();
 
 var layer = new TileLayer();
 
 var map = new Map({
   layers: [layer],
   target: 'map',
-  view: new _ol_View_({
+  view: new View({
     center: [0, 0],
     zoom: 2
   })

examples/line-arrows.js

@@ -1,20 +1,20 @@
 import Map from '../src/ol/Map.js';
-import _ol_View_ from '../src/ol/View.js';
+import View from '../src/ol/View.js';
 import Point from '../src/ol/geom/Point.js';
 import Draw from '../src/ol/interaction/Draw.js';
 import TileLayer from '../src/ol/layer/Tile.js';
-import _ol_layer_Vector_ 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 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_Stroke_ from '../src/ol/style/Stroke.js';
 import _ol_style_Style_ from '../src/ol/style/Style.js';
 
 var raster = new TileLayer({
-  source: new _ol_source_OSM_()
+  source: new OSM()
 });
 
-var source = new _ol_source_Vector_();
+var source = new VectorSource();
 
 var styleFunction = function(feature) {
   var geometry = feature.getGeometry();
@@ -46,7 +46,7 @@ var styleFunction = function(feature) {
 
   return styles;
 };
-var vector = new _ol_layer_Vector_({
+var vector = new VectorLayer({
   source: source,
   style: styleFunction
 });
@@ -54,7 +54,7 @@ var vector = new _ol_layer_Vector_({
 var map = new Map({
   layers: [raster, vector],
   target: 'map',
-  view: new _ol_View_({
+  view: new View({
     center: [-11000000, 4600000],
     zoom: 4
   })

examples/localized-openstreetmap.js

@@ -1,15 +1,15 @@
 import Map from '../src/ol/Map.js';
-import _ol_View_ from '../src/ol/View.js';
+import View from '../src/ol/View.js';
 import {defaults as defaultControls} from '../src/ol/control.js';
 import TileLayer from '../src/ol/layer/Tile.js';
-import _ol_source_OSM_ from '../src/ol/source/OSM.js';
+import OSM from '../src/ol/source/OSM.js';
 
 
 var openCycleMapLayer = new TileLayer({
-  source: new _ol_source_OSM_({
+  source: new OSM({
     attributions: [
       'All maps © <a href="https://www.opencyclemap.org/">OpenCycleMap</a>',
-      _ol_source_OSM_.ATTRIBUTION
+      OSM.ATTRIBUTION
     ],
     url: 'https://{a-c}.tile.thunderforest.com/cycle/{z}/{x}/{y}.png' +
         '?apikey=0e6fc415256d4fbb9b5166a718591d71'
@@ -17,10 +17,10 @@ var openCycleMapLayer = new TileLayer({
 });
 
 var openSeaMapLayer = new TileLayer({
-  source: new _ol_source_OSM_({
+  source: new OSM({
     attributions: [
       'All maps © <a href="http://www.openseamap.org/">OpenSeaMap</a>',
-      _ol_source_OSM_.ATTRIBUTION
+      OSM.ATTRIBUTION
     ],
     opaque: false,
     url: 'https://tiles.openseamap.org/seamark/{z}/{x}/{y}.png'
@@ -39,7 +39,7 @@ var map = new Map({
       collapsible: false
     }
   }),
-  view: new _ol_View_({
+  view: new View({
     maxZoom: 18,
     center: [-244780.24508882355, 5986452.183179816],
     zoom: 15

examples/magnify.js

@@ -1,13 +1,13 @@
 import Map from '../src/ol/Map.js';
-import _ol_View_ from '../src/ol/View.js';
+import View from '../src/ol/View.js';
 import TileLayer from '../src/ol/layer/Tile.js';
 import {fromLonLat} from '../src/ol/proj.js';
-import _ol_source_BingMaps_ from '../src/ol/source/BingMaps.js';
+import BingMaps from '../src/ol/source/BingMaps.js';
 
 var key = 'As1HiMj1PvLPlqc_gtM7AqZfBL8ZL3VrjaS3zIb22Uvb9WKhuJObROC-qUpa81U5';
 
 var imagery = new TileLayer({
-  source: new _ol_source_BingMaps_({key: key, imagerySet: 'Aerial'})
+  source: new BingMaps({key: key, imagerySet: 'Aerial'})
 });
 
 var container = document.getElementById('map');
@@ -15,7 +15,7 @@ var container = document.getElementById('map');
 var map = new Map({
   layers: [imagery],
   target: container,
-  view: new _ol_View_({
+  view: new View({
     center: fromLonLat([-109, 46.5]),
     zoom: 6
   })

examples/mapbox-vector-tiles-advanced.js

@@ -1,9 +1,9 @@
 import Map from '../src/ol/Map.js';
-import _ol_View_ from '../src/ol/View.js';
+import View from '../src/ol/View.js';
 import MVT from '../src/ol/format/MVT.js';
 import _ol_layer_VectorTile_ from '../src/ol/layer/VectorTile.js';
 import {get as getProjection} from '../src/ol/proj.js';
-import _ol_source_VectorTile_ from '../src/ol/source/VectorTile.js';
+import VectorTileSource from '../src/ol/source/VectorTile.js';
 import _ol_style_Fill_ from '../src/ol/style/Fill.js';
 import _ol_style_Icon_ from '../src/ol/style/Icon.js';
 import _ol_style_Stroke_ from '../src/ol/style/Stroke.js';
@@ -33,7 +33,7 @@ function tileUrlFunction(tileCoord) {
 var map = new Map({
   layers: [
     new _ol_layer_VectorTile_({
-      source: new _ol_source_VectorTile_({
+      source: new VectorTileSource({
         attributions: '© <a href="https://www.mapbox.com/map-feedback/">Mapbox</a> ' +
           '© <a href="https://www.openstreetmap.org/copyright">' +
           'OpenStreetMap contributors</a>',
@@ -49,7 +49,7 @@ var map = new Map({
     })
   ],
   target: 'map',
-  view: new _ol_View_({
+  view: new View({
     center: [0, 0],
     minZoom: 1,
     zoom: 2

examples/mapbox-vector-tiles.js

@@ -1,8 +1,8 @@
 import Map from '../src/ol/Map.js';
-import _ol_View_ from '../src/ol/View.js';
+import View from '../src/ol/View.js';
 import MVT from '../src/ol/format/MVT.js';
 import _ol_layer_VectorTile_ from '../src/ol/layer/VectorTile.js';
-import _ol_source_VectorTile_ from '../src/ol/source/VectorTile.js';
+import VectorTileSource from '../src/ol/source/VectorTile.js';
 import _ol_style_Fill_ from '../src/ol/style/Fill.js';
 import _ol_style_Icon_ from '../src/ol/style/Icon.js';
 import _ol_style_Stroke_ from '../src/ol/style/Stroke.js';
@@ -16,7 +16,7 @@ var map = new Map({
   layers: [
     new _ol_layer_VectorTile_({
       declutter: true,
-      source: new _ol_source_VectorTile_({
+      source: new VectorTileSource({
         attributions: '© <a href="https://www.mapbox.com/map-feedback/">Mapbox</a> ' +
           '© <a href="https://www.openstreetmap.org/copyright">' +
           'OpenStreetMap contributors</a>',
@@ -28,7 +28,7 @@ var map = new Map({
     })
   ],
   target: 'map',
-  view: new _ol_View_({
+  view: new View({
     center: [0, 0],
     zoom: 2
   })

examples/mapguide-untiled.js

@@ -1,7 +1,7 @@
 import Map from '../src/ol/Map.js';
-import _ol_View_ from '../src/ol/View.js';
+import View from '../src/ol/View.js';
-import _ol_layer_Image_ from '../src/ol/layer/Image.js';
+import ImageLayer from '../src/ol/layer/Image.js';
-import _ol_source_ImageMapGuide_ from '../src/ol/source/ImageMapGuide.js';
+import ImageMapGuide from '../src/ol/source/ImageMapGuide.js';
 
 var mdf = 'Library://Public/Samples/Sheboygan/Maps/Sheboygan.MapDefinition';
 var agentUrl =
@@ -14,9 +14,9 @@ var bounds = [
 ];
 var map = new Map({
   layers: [
-    new _ol_layer_Image_({
+    new ImageLayer({
       extent: bounds,
-      source: new _ol_source_ImageMapGuide_({
+      source: new ImageMapGuide({
         projection: 'EPSG:4326',
         url: agentUrl,
         useOverlay: false,
@@ -32,7 +32,7 @@ var map = new Map({
     })
   ],
   target: 'map',
-  view: new _ol_View_({
+  view: new View({
     center: [-87.7302542509315, 43.744459064634],
     projection: 'EPSG:4326',
     zoom: 12

examples/measure.js

@@ -1,15 +1,15 @@
 import Map from '../src/ol/Map.js';
-import _ol_Observable_ from '../src/ol/Observable.js';
+import Observable from '../src/ol/Observable.js';
 import _ol_Overlay_ from '../src/ol/Overlay.js';
 import {getArea, getLength} from '../src/ol/sphere.js';
-import _ol_View_ from '../src/ol/View.js';
+import View from '../src/ol/View.js';
 import LineString from '../src/ol/geom/LineString.js';
 import Polygon from '../src/ol/geom/Polygon.js';
 import Draw from '../src/ol/interaction/Draw.js';
 import TileLayer from '../src/ol/layer/Tile.js';
-import _ol_layer_Vector_ 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 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_Fill_ from '../src/ol/style/Fill.js';
 import _ol_style_Stroke_ from '../src/ol/style/Stroke.js';
@@ -17,12 +17,12 @@ import _ol_style_Style_ from '../src/ol/style/Style.js';
 
 
 var raster = new TileLayer({
-  source: new _ol_source_OSM_()
+  source: new OSM()
 });
 
-var source = new _ol_source_Vector_();
+var source = new VectorSource();
 
-var vector = new _ol_layer_Vector_({
+var vector = new VectorLayer({
   source: source,
   style: new _ol_style_Style_({
     fill: new _ol_style_Fill_({
@@ -121,7 +121,7 @@ var pointerMoveHandler = function(evt) {
 var map = new Map({
   layers: [raster, vector],
   target: 'map',
-  view: new _ol_View_({
+  view: new View({
     center: [-11000000, 4600000],
     zoom: 15
   })
@@ -238,7 +238,7 @@ function addInteraction() {
         // unset tooltip so that a new one can be created
         measureTooltipElement = null;
         createMeasureTooltip();
-        _ol_Observable_.unByKey(listener);
+        Observable.unByKey(listener);
       }, this);
 }
 

examples/min-max-resolution.js

@@ -1,9 +1,9 @@
 import Map from '../src/ol/Map.js';
-import _ol_View_ from '../src/ol/View.js';
+import View from '../src/ol/View.js';
 import {defaults as defaultControls} from '../src/ol/control.js';
 import TileLayer from '../src/ol/layer/Tile.js';
-import _ol_source_OSM_ from '../src/ol/source/OSM.js';
+import OSM from '../src/ol/source/OSM.js';
-import _ol_source_TileJSON_ from '../src/ol/source/TileJSON.js';
+import TileJSON from '../src/ol/source/TileJSON.js';
 
 
 /**
@@ -12,12 +12,12 @@ import _ol_source_TileJSON_ from '../src/ol/source/TileJSON.js';
 var map = new Map({
   layers: [
     new TileLayer({
-      source: new _ol_source_OSM_(),
+      source: new OSM(),
       minResolution: 200,
       maxResolution: 2000
     }),
     new TileLayer({
-      source: new _ol_source_TileJSON_({
+      source: new TileJSON({
         url: 'https://api.tiles.mapbox.com/v3/mapbox.natural-earth-hypso-bathy.json?secure',
         crossOrigin: 'anonymous'
       }),
@@ -31,7 +31,7 @@ var map = new Map({
       collapsible: false
     }
   }),
-  view: new _ol_View_({
+  view: new View({
     center: [653600, 5723680],
     zoom: 5
   })

examples/min-zoom.js

@@ -1,7 +1,7 @@
 import Map from '../src/ol/Map.js';
-import _ol_View_ from '../src/ol/View.js';
+import View from '../src/ol/View.js';
 import TileLayer from '../src/ol/layer/Tile.js';
-import _ol_source_OSM_ from '../src/ol/source/OSM.js';
+import OSM from '../src/ol/source/OSM.js';
 
 var viewport = document.getElementById('map');
 
@@ -12,7 +12,7 @@ function getMinZoom() {
 
 var initialZoom = getMinZoom();
 
-var view = new _ol_View_({
+var view = new View({
   center: [0, 0],
   minZoom: initialZoom,
   zoom: initialZoom
@@ -21,7 +21,7 @@ var view = new _ol_View_({
 var map = new Map({
   layers: [
     new TileLayer({
-      source: new _ol_source_OSM_()
+      source: new OSM()
     })
   ],
   target: 'map',

examples/mobile-full-screen.js

@@ -1,11 +1,11 @@
 import Geolocation from '../src/ol/Geolocation.js';
 import Map from '../src/ol/Map.js';
-import _ol_View_ from '../src/ol/View.js';
+import View from '../src/ol/View.js';
 import TileLayer from '../src/ol/layer/Tile.js';
-import _ol_source_BingMaps_ from '../src/ol/source/BingMaps.js';
+import BingMaps from '../src/ol/source/BingMaps.js';
 
 
-var view = new _ol_View_({
+var view = new View({
   center: [0, 0],
   zoom: 2
 });
@@ -13,7 +13,7 @@ var view = new _ol_View_({
 var map = new Map({
   layers: [
     new TileLayer({
-      source: new _ol_source_BingMaps_({
+      source: new BingMaps({
         key: 'As1HiMj1PvLPlqc_gtM7AqZfBL8ZL3VrjaS3zIb22Uvb9WKhuJObROC-qUpa81U5',
         imagerySet: 'Road'
       })

examples/modify-features.js

@@ -1,21 +1,21 @@
 import Map from '../src/ol/Map.js';
-import _ol_View_ from '../src/ol/View.js';
+import View from '../src/ol/View.js';
 import GeoJSON from '../src/ol/format/GeoJSON.js';
 import {defaults as defaultInteractions} from '../src/ol/interaction.js';
 import _ol_interaction_Modify_ from '../src/ol/interaction/Modify.js';
 import _ol_interaction_Select_ from '../src/ol/interaction/Select.js';
 import TileLayer from '../src/ol/layer/Tile.js';
-import _ol_layer_Vector_ 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 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({
-  source: new _ol_source_OSM_()
+  source: new OSM()
 });
 
-var vector = new _ol_layer_Vector_({
+var vector = new VectorLayer({
-  source: new _ol_source_Vector_({
+  source: new VectorSource({
     url: 'data/geojson/countries.geojson',
     format: new GeoJSON(),
     wrapX: false
@@ -34,7 +34,7 @@ var map = new Map({
   interactions: defaultInteractions().extend([select, modify]),
   layers: [raster, vector],
   target: 'map',
-  view: new _ol_View_({
+  view: new View({
     center: [0, 0],
     zoom: 2
   })

examples/modify-test.js

@@ -1,11 +1,11 @@
 import Map from '../src/ol/Map.js';
-import _ol_View_ from '../src/ol/View.js';
+import View from '../src/ol/View.js';
 import GeoJSON from '../src/ol/format/GeoJSON.js';
 import {defaults as defaultInteractions} from '../src/ol/interaction.js';
 import _ol_interaction_Modify_ from '../src/ol/interaction/Modify.js';
 import _ol_interaction_Select_ from '../src/ol/interaction/Select.js';
-import _ol_layer_Vector_ 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_Fill_ from '../src/ol/style/Fill.js';
 import _ol_style_Stroke_ from '../src/ol/style/Stroke.js';
@@ -144,11 +144,11 @@ var geojsonObject = {
   }]
 };
 
-var source = new _ol_source_Vector_({
+var source = new VectorSource({
   features: (new GeoJSON()).readFeatures(geojsonObject)
 });
 
-var layer = new _ol_layer_Vector_({
+var layer = new VectorLayer({
   source: source,
   style: styleFunction
 });
@@ -235,7 +235,7 @@ var map = new Map({
   interactions: defaultInteractions().extend([select, modify]),
   layers: [layer],
   target: 'map',
-  view: new _ol_View_({
+  view: new View({
     center: [0, 1000000],
     zoom: 2
   })

examples/mouse-position.js

@@ -1,10 +1,10 @@
 import Map from '../src/ol/Map.js';
-import _ol_View_ from '../src/ol/View.js';
+import View from '../src/ol/View.js';
 import {defaults as defaultControls} from '../src/ol/control.js';
 import MousePosition from '../src/ol/control/MousePosition.js';
 import _ol_coordinate_ from '../src/ol/coordinate.js';
 import TileLayer from '../src/ol/layer/Tile.js';
-import _ol_source_OSM_ from '../src/ol/source/OSM.js';
+import OSM from '../src/ol/source/OSM.js';
 
 var mousePositionControl = new MousePosition({
   coordinateFormat: _ol_coordinate_.createStringXY(4),
@@ -24,11 +24,11 @@ var map = new Map({
   }).extend([mousePositionControl]),
   layers: [
     new TileLayer({
-      source: new _ol_source_OSM_()
+      source: new OSM()
     })
   ],
   target: 'map',
-  view: new _ol_View_({
+  view: new View({
     center: [0, 0],
     zoom: 2
   })

examples/mousewheel-zoom.js

@@ -1,9 +1,9 @@
 import Map from '../src/ol/Map.js';
-import _ol_View_ from '../src/ol/View.js';
+import View from '../src/ol/View.js';
 import {defaults as defaultInteractions} from '../src/ol/interaction.js';
 import MouseWheelZoom from '../src/ol/interaction/MouseWheelZoom.js';
 import TileLayer from '../src/ol/layer/Tile.js';
-import _ol_source_OSM_ from '../src/ol/source/OSM.js';
+import OSM from '../src/ol/source/OSM.js';
 
 
 var map = new Map({
@@ -14,11 +14,11 @@ var map = new Map({
   ]),
   layers: [
     new TileLayer({
-      source: new _ol_source_OSM_()
+      source: new OSM()
     })
   ],
   target: 'map',
-  view: new _ol_View_({
+  view: new View({
     center: [0, 0],
     zoom: 2
   })

examples/moveend.js

@@ -1,16 +1,16 @@
 import Map from '../src/ol/Map.js';
-import _ol_View_ from '../src/ol/View.js';
+import View from '../src/ol/View.js';
 import {defaults as defaultControls} from '../src/ol/control.js';
 import * as _ol_extent_ from '../src/ol/extent.js';
 import TileLayer from '../src/ol/layer/Tile.js';
 import {toLonLat} from '../src/ol/proj.js';
-import _ol_source_OSM_ from '../src/ol/source/OSM.js';
+import OSM from '../src/ol/source/OSM.js';
 
 
 var map = new Map({
   layers: [
     new TileLayer({
-      source: new _ol_source_OSM_()
+      source: new OSM()
     })
   ],
   target: 'map',
@@ -19,7 +19,7 @@ var map = new Map({
       collapsible: false
     }
   }),
-  view: new _ol_View_({
+  view: new View({
     center: [0, 0],
     zoom: 2
   })

examples/navigation-controls.js

@@ -1,9 +1,9 @@
 import Map from '../src/ol/Map.js';
-import _ol_View_ from '../src/ol/View.js';
+import View from '../src/ol/View.js';
 import {defaults as defaultControls} from '../src/ol/control.js';
 import ZoomToExtent from '../src/ol/control/ZoomToExtent.js';
 import TileLayer from '../src/ol/layer/Tile.js';
-import _ol_source_OSM_ from '../src/ol/source/OSM.js';
+import OSM from '../src/ol/source/OSM.js';
 
 
 var map = new Map({
@@ -21,11 +21,11 @@ var map = new Map({
   ]),
   layers: [
     new TileLayer({
-      source: new _ol_source_OSM_()
+      source: new OSM()
     })
   ],
   target: 'map',
-  view: new _ol_View_({
+  view: new View({
     center: [0, 0],
     zoom: 2
   })

examples/osm-vector-tiles.js

@@ -1,9 +1,9 @@
 import Map from '../src/ol/Map.js';
-import _ol_View_ from '../src/ol/View.js';
+import View from '../src/ol/View.js';
 import TopoJSON from '../src/ol/format/TopoJSON.js';
 import _ol_layer_VectorTile_ from '../src/ol/layer/VectorTile.js';
 import {fromLonLat} from '../src/ol/proj.js';
-import _ol_source_VectorTile_ from '../src/ol/source/VectorTile.js';
+import VectorTileSource from '../src/ol/source/VectorTile.js';
 import _ol_style_Fill_ from '../src/ol/style/Fill.js';
 import _ol_style_Stroke_ from '../src/ol/style/Stroke.js';
 import _ol_style_Style_ from '../src/ol/style/Style.js';
@@ -61,7 +61,7 @@ var roadStyle = function(feature) {
 var map = new Map({
   layers: [
     new _ol_layer_VectorTile_({
-      source: new _ol_source_VectorTile_({
+      source: new VectorTileSource({
         attributions: '© OpenStreetMap contributors, Who’s On First, ' +
             'Natural Earth, and openstreetmapdata.com',
         format: new TopoJSON({
@@ -82,7 +82,7 @@ var map = new Map({
     })
   ],
   target: 'map',
-  view: new _ol_View_({
+  view: new View({
     center: fromLonLat([-74.0064, 40.7142]),
     maxZoom: 19,
     zoom: 15

examples/overlay.js

@@ -1,20 +1,20 @@
 import Map from '../src/ol/Map.js';
 import _ol_Overlay_ from '../src/ol/Overlay.js';
-import _ol_View_ from '../src/ol/View.js';
+import View from '../src/ol/View.js';
 import _ol_coordinate_ from '../src/ol/coordinate.js';
 import TileLayer from '../src/ol/layer/Tile.js';
 import {fromLonLat, toLonLat} from '../src/ol/proj.js';
-import _ol_source_OSM_ from '../src/ol/source/OSM.js';
+import OSM from '../src/ol/source/OSM.js';
 
 
 var layer = new TileLayer({
-  source: new _ol_source_OSM_()
+  source: new OSM()
 });
 
 var map = new Map({
   layers: [layer],
   target: 'map',
-  view: new _ol_View_({
+  view: new View({
     center: [0, 0],
     zoom: 2
   })

examples/overviewmap-custom.js

@@ -1,11 +1,11 @@
 import Map from '../src/ol/Map.js';
-import _ol_View_ from '../src/ol/View.js';
+import View from '../src/ol/View.js';
 import {defaults as defaultControls} from '../src/ol/control.js';
 import OverviewMap from '../src/ol/control/OverviewMap.js';
 import {defaults as defaultInteractions} from '../src/ol/interaction.js';
 import DragRotateAndZoom from '../src/ol/interaction/DragRotateAndZoom.js';
 import TileLayer from '../src/ol/layer/Tile.js';
-import _ol_source_OSM_ from '../src/ol/source/OSM.js';
+import OSM from '../src/ol/source/OSM.js';
 
 
 var overviewMapControl = new OverviewMap({
@@ -13,7 +13,7 @@ var overviewMapControl = new OverviewMap({
   className: 'ol-overviewmap ol-custom-overviewmap',
   layers: [
     new TileLayer({
-      source: new _ol_source_OSM_({
+      source: new OSM({
         'url': 'https://{a-c}.tile.thunderforest.com/cycle/{z}/{x}/{y}.png' +
             '?apikey=0e6fc415256d4fbb9b5166a718591d71'
       })
@@ -33,11 +33,11 @@ var map = new Map({
   ]),
   layers: [
     new TileLayer({
-      source: new _ol_source_OSM_()
+      source: new OSM()
     })
   ],
   target: 'map',
-  view: new _ol_View_({
+  view: new View({
     center: [500000, 6000000],
     zoom: 7
   })

examples/overviewmap.js

@@ -1,9 +1,9 @@
 import Map from '../src/ol/Map.js';
-import _ol_View_ from '../src/ol/View.js';
+import View from '../src/ol/View.js';
 import {defaults as defaultControls} from '../src/ol/control.js';
 import OverviewMap from '../src/ol/control/OverviewMap.js';
 import TileLayer from '../src/ol/layer/Tile.js';
-import _ol_source_OSM_ from '../src/ol/source/OSM.js';
+import OSM from '../src/ol/source/OSM.js';
 
 var map = new Map({
   controls: defaultControls().extend([
@@ -11,11 +11,11 @@ var map = new Map({
   ]),
   layers: [
     new TileLayer({
-      source: new _ol_source_OSM_()
+      source: new OSM()
     })
   ],
   target: 'map',
-  view: new _ol_View_({
+  view: new View({
     center: [500000, 6000000],
     zoom: 7
   })

examples/permalink.js

@@ -1,8 +1,8 @@
 import Map from '../src/ol/Map.js';
-import _ol_View_ from '../src/ol/View.js';
+import View from '../src/ol/View.js';
 import {defaults as defaultControls} from '../src/ol/control.js';
 import TileLayer from '../src/ol/layer/Tile.js';
-import _ol_source_OSM_ from '../src/ol/source/OSM.js';
+import OSM from '../src/ol/source/OSM.js';
 
 // default zoom, center and rotation
 var zoom = 2;
@@ -26,7 +26,7 @@ if (window.location.hash !== '') {
 var map = new Map({
   layers: [
     new TileLayer({
-      source: new _ol_source_OSM_()
+      source: new OSM()
     })
   ],
   controls: defaultControls({
@@ -35,7 +35,7 @@ var map = new Map({
     }
   }),
   target: 'map',
-  view: new _ol_View_({
+  view: new View({
     center: center,
     zoom: zoom,
     rotation: rotation

examples/pinch-zoom.js

@@ -1,9 +1,9 @@
 import Map from '../src/ol/Map.js';
-import _ol_View_ from '../src/ol/View.js';
+import View from '../src/ol/View.js';
 import {defaults as defaultInteractions} from '../src/ol/interaction.js';
 import _ol_interaction_PinchZoom_ from '../src/ol/interaction/PinchZoom.js';
 import TileLayer from '../src/ol/layer/Tile.js';
-import _ol_source_OSM_ from '../src/ol/source/OSM.js';
+import OSM from '../src/ol/source/OSM.js';
 
 
 var map = new Map({
@@ -14,11 +14,11 @@ var map = new Map({
   ]),
   layers: [
     new TileLayer({
-      source: new _ol_source_OSM_()
+      source: new OSM()
     })
   ],
   target: 'map',
-  view: new _ol_View_({
+  view: new View({
     center: [0, 0],
     zoom: 2
   })

examples/polygon-styles.js

@@ -1,9 +1,9 @@
 import Map from '../src/ol/Map.js';
-import _ol_View_ from '../src/ol/View.js';
+import View from '../src/ol/View.js';
 import GeoJSON from '../src/ol/format/GeoJSON.js';
 import MultiPoint from '../src/ol/geom/MultiPoint.js';
-import _ol_layer_Vector_ 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_Fill_ from '../src/ol/style/Fill.js';
 import _ol_style_Stroke_ from '../src/ol/style/Stroke.js';
@@ -80,11 +80,11 @@ var geojsonObject = {
   }]
 };
 
-var source = new _ol_source_Vector_({
+var source = new VectorSource({
   features: (new GeoJSON()).readFeatures(geojsonObject)
 });
 
-var layer = new _ol_layer_Vector_({
+var layer = new VectorLayer({
   source: source,
   style: styles
 });
@@ -92,7 +92,7 @@ var layer = new _ol_layer_Vector_({
 var map = new Map({
   layers: [layer],
   target: 'map',
-  view: new _ol_View_({
+  view: new View({
     center: [0, 3000000],
     zoom: 2
   })

examples/popup.js

@@ -1,10 +1,10 @@
 import Map from '../src/ol/Map.js';
 import _ol_Overlay_ from '../src/ol/Overlay.js';
-import _ol_View_ from '../src/ol/View.js';
+import View from '../src/ol/View.js';
 import _ol_coordinate_ from '../src/ol/coordinate.js';
 import TileLayer from '../src/ol/layer/Tile.js';
 import {toLonLat} from '../src/ol/proj.js';
-import _ol_source_TileJSON_ from '../src/ol/source/TileJSON.js';
+import TileJSON from '../src/ol/source/TileJSON.js';
 
 
 /**
@@ -44,7 +44,7 @@ closer.onclick = function() {
 var map = new Map({
   layers: [
     new TileLayer({
-      source: new _ol_source_TileJSON_({
+      source: new TileJSON({
         url: 'https://api.tiles.mapbox.com/v3/mapbox.natural-earth-hypso-bathy.json?secure',
         crossOrigin: 'anonymous'
       })
@@ -52,7 +52,7 @@ var map = new Map({
   ],
   overlays: [overlay],
   target: 'map',
-  view: new _ol_View_({
+  view: new View({
     center: [0, 0],
     zoom: 2
   })

examples/preload.js

@@ -1,10 +1,10 @@
 import Map from '../src/ol/Map.js';
-import _ol_View_ from '../src/ol/View.js';
+import View from '../src/ol/View.js';
 import TileLayer from '../src/ol/layer/Tile.js';
-import _ol_source_BingMaps_ from '../src/ol/source/BingMaps.js';
+import BingMaps from '../src/ol/source/BingMaps.js';
 
 
-var view = new _ol_View_({
+var view = new View({
   center: [-4808600, -2620936],
   zoom: 8
 });
@@ -13,7 +13,7 @@ var map1 = new Map({
   layers: [
     new TileLayer({
       preload: Infinity,
-      source: new _ol_source_BingMaps_({
+      source: new BingMaps({
         key: 'As1HiMj1PvLPlqc_gtM7AqZfBL8ZL3VrjaS3zIb22Uvb9WKhuJObROC-qUpa81U5',
         imagerySet: 'Aerial'
       })
@@ -27,7 +27,7 @@ var map2 = new Map({
   layers: [
     new TileLayer({
       preload: 0, // default value
-      source: new _ol_source_BingMaps_({
+      source: new BingMaps({
         key: 'As1HiMj1PvLPlqc_gtM7AqZfBL8ZL3VrjaS3zIb22Uvb9WKhuJObROC-qUpa81U5',
         imagerySet: 'AerialWithLabels'
       })

examples/raster.js

@@ -1,10 +1,10 @@
 // NOCOMPILE
 // this example uses d3 for which we don't have an externs file.
 import Map from '../src/ol/Map.js';
-import _ol_View_ from '../src/ol/View.js';
+import View from '../src/ol/View.js';
-import _ol_layer_Image_ from '../src/ol/layer/Image.js';
+import ImageLayer from '../src/ol/layer/Image.js';
 import TileLayer from '../src/ol/layer/Tile.js';
-import _ol_source_BingMaps_ from '../src/ol/source/BingMaps.js';
+import BingMaps from '../src/ol/source/BingMaps.js';
 import RasterSource from '../src/ol/source/Raster.js';
 
 var minVgi = 0;
@@ -49,7 +49,7 @@ function summarize(value, counts) {
 /**
  * Use aerial imagery as the input data for the raster source.
  */
-var bing = new _ol_source_BingMaps_({
+var bing = new BingMaps({
   key: 'As1HiMj1PvLPlqc_gtM7AqZfBL8ZL3VrjaS3zIb22Uvb9WKhuJObROC-qUpa81U5',
   imagerySet: 'Aerial'
 });
@@ -115,12 +115,12 @@ var map = new Map({
     new TileLayer({
       source: bing
     }),
-    new _ol_layer_Image_({
+    new ImageLayer({
       source: raster
     })
   ],
   target: 'map',
-  view: new _ol_View_({
+  view: new View({
     center: [-9651695, 4937351],
     zoom: 13,
     minZoom: 12,

examples/region-growing.js

@@ -1,10 +1,10 @@
 // NOCOMPILE
 import Map from '../src/ol/Map.js';
-import _ol_View_ from '../src/ol/View.js';
+import View from '../src/ol/View.js';
-import _ol_layer_Image_ from '../src/ol/layer/Image.js';
+import ImageLayer from '../src/ol/layer/Image.js';
 import TileLayer from '../src/ol/layer/Tile.js';
 import {fromLonLat} from '../src/ol/proj.js';
-import _ol_source_BingMaps_ from '../src/ol/source/BingMaps.js';
+import BingMaps from '../src/ol/source/BingMaps.js';
 import RasterSource from '../src/ol/source/Raster.js';
 
 function growRegion(inputs, data) {
@@ -75,7 +75,7 @@ function next4Edges(edge) {
 var key = 'As1HiMj1PvLPlqc_gtM7AqZfBL8ZL3VrjaS3zIb22Uvb9WKhuJObROC-qUpa81U5';
 
 var imagery = new TileLayer({
-  source: new _ol_source_BingMaps_({key: key, imagerySet: 'Aerial'})
+  source: new BingMaps({key: key, imagerySet: 'Aerial'})
 });
 
 var raster = new RasterSource({
@@ -89,7 +89,7 @@ var raster = new RasterSource({
   }
 });
 
-var rasterImage = new _ol_layer_Image_({
+var rasterImage = new ImageLayer({
   opacity: 0.7,
   source: raster
 });
@@ -97,7 +97,7 @@ var rasterImage = new _ol_layer_Image_({
 var map = new Map({
   layers: [imagery, rasterImage],
   target: 'map',
-  view: new _ol_View_({
+  view: new View({
     center: fromLonLat([-119.07, 47.65]),
     zoom: 11
   })

examples/regularshape.js

@@ -1,9 +1,9 @@
-import _ol_Feature_ from '../src/ol/Feature.js';
+import Feature from '../src/ol/Feature.js';
 import Map from '../src/ol/Map.js';
-import _ol_View_ from '../src/ol/View.js';
+import View from '../src/ol/View.js';
 import Point from '../src/ol/geom/Point.js';
-import _ol_layer_Vector_ 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_RegularShape_ from '../src/ol/style/RegularShape.js';
 import _ol_style_Stroke_ from '../src/ol/style/Stroke.js';
@@ -72,15 +72,15 @@ var features = new Array(count);
 var e = 4500000;
 for (var i = 0; i < count; ++i) {
   var coordinates = [2 * e * Math.random() - e, 2 * e * Math.random() - e];
-  features[i] = new _ol_Feature_(new Point(coordinates));
+  features[i] = new Feature(new Point(coordinates));
   features[i].setStyle(styles[styleKeys[Math.floor(Math.random() * 5)]]);
 }
 
-var source = new _ol_source_Vector_({
+var source = new VectorSource({
   features: features
 });
 
-var vectorLayer = new _ol_layer_Vector_({
+var vectorLayer = new VectorLayer({
   source: source
 });
 
@@ -89,7 +89,7 @@ var map = new Map({
     vectorLayer
   ],
   target: 'map',
-  view: new _ol_View_({
+  view: new View({
     center: [0, 0],
     zoom: 2
   })

examples/reprojection-by-code.js

@@ -1,22 +1,22 @@
 import Map from '../src/ol/Map.js';
-import _ol_View_ from '../src/ol/View.js';
+import View from '../src/ol/View.js';
 import * as _ol_extent_ from '../src/ol/extent.js';
 import TileLayer from '../src/ol/layer/Tile.js';
 import {get as getProjection, getTransform} from '../src/ol/proj.js';
 import {register} from '../src/ol/proj/proj4.js';
-import _ol_source_OSM_ from '../src/ol/source/OSM.js';
+import OSM from '../src/ol/source/OSM.js';
-import _ol_source_TileImage_ from '../src/ol/source/TileImage.js';
+import TileImage from '../src/ol/source/TileImage.js';
 import proj4 from 'proj4';
 
 
 var map = new Map({
   layers: [
     new TileLayer({
-      source: new _ol_source_OSM_()
+      source: new OSM()
     })
   ],
   target: 'map',
-  view: new _ol_View_({
+  view: new View({
     projection: 'EPSG:3857',
     center: [0, 0],
     zoom: 1
@@ -32,7 +32,7 @@ var renderEdgesCheckbox = document.getElementById('render-edges');
 function setProjection(code, name, proj4def, bbox) {
   if (code === null || name === null || proj4def === null || bbox === null) {
     resultSpan.innerHTML = 'Nothing usable found, using EPSG:3857...';
-    map.setView(new _ol_View_({
+    map.setView(new View({
       projection: 'EPSG:3857',
       center: [0, 0],
       zoom: 1
@@ -52,7 +52,7 @@ function setProjection(code, name, proj4def, bbox) {
   var extent = _ol_extent_.applyTransform(
       [bbox[1], bbox[2], bbox[3], bbox[0]], fromLonLat);
   newProj.setExtent(extent);
-  var newView = new _ol_View_({
+  var newView = new View({
     projection: newProj
   });
   map.setView(newView);
@@ -102,7 +102,7 @@ renderEdgesCheckbox.onchange = function() {
   map.getLayers().forEach(function(layer) {
     if (layer instanceof TileLayer) {
       var source = layer.getSource();
-      if (source instanceof _ol_source_TileImage_) {
+      if (source instanceof TileImage) {
         source.setRenderReprojectionEdges(renderEdgesCheckbox.checked);
       }
     }