diff --git a/examples/epsg-4326.js b/examples/epsg-4326.js index 303da4c23e..c846d892fa 100644 --- a/examples/epsg-4326.js +++ b/examples/epsg-4326.js @@ -4,6 +4,7 @@ goog.require('ol.Map'); goog.require('ol.RendererHint'); goog.require('ol.View2D'); goog.require('ol.control.ScaleLineUnits'); +goog.require('ol.control.defaults'); goog.require('ol.layer.TileLayer'); goog.require('ol.projection'); goog.require('ol.source.TiledWMS'); @@ -24,11 +25,15 @@ var layers = new ol.Collection([ ]); var map = new ol.Map({ + controls: ol.control.defaults({ + scaleLine: true, + scaleLineOptions: /** @type {ol.control.ScaleLineOptions} */ ({ + units: ol.control.ScaleLineUnits.DEGREES + }) + }), layers: layers, // The OSgeo server does not set cross origin headers, so we cannot use WebGL renderers: [ol.RendererHint.CANVAS, ol.RendererHint.DOM], - scaleLineControl: true, - scaleLineUnits: ol.control.ScaleLineUnits.DEGREES, target: 'map', view: new ol.View2D({ projection: ol.projection.getFromCode('EPSG:4326'), diff --git a/examples/full-screen.js b/examples/full-screen.js index 8ab4ca96ea..fb2e1ecfe7 100644 --- a/examples/full-screen.js +++ b/examples/full-screen.js @@ -5,6 +5,7 @@ goog.require('ol.Geolocation'); goog.require('ol.Map'); goog.require('ol.RendererHints'); goog.require('ol.View2D'); +goog.require('ol.control.defaults'); goog.require('ol.layer.TileLayer'); goog.require('ol.source.MapQuestOpenAerial'); @@ -13,9 +14,11 @@ var layer = new ol.layer.TileLayer({ source: new ol.source.MapQuestOpenAerial() }); var map = new ol.Map({ + controls: ol.control.defaults({ + scaleLine: true + }), layers: new ol.Collection([layer]), renderers: ol.RendererHints.createFromQueryData(), - scaleLineControl: true, target: 'map', view: new ol.View2D({ center: new ol.Coordinate(0, 0), diff --git a/examples/side-by-side.js b/examples/side-by-side.js index 3a02b02e89..8f9e322664 100644 --- a/examples/side-by-side.js +++ b/examples/side-by-side.js @@ -5,6 +5,7 @@ goog.require('ol.RendererHint'); goog.require('ol.View2D'); goog.require('ol.animation'); goog.require('ol.control.MousePosition'); +goog.require('ol.control.defaults'); goog.require('ol.easing'); goog.require('ol.interaction.Keyboard'); goog.require('ol.layer.TileLayer'); @@ -26,22 +27,28 @@ var view = new ol.View2D({ zoom: 1 }); -var domMap = new ol.Map({ - layers: new ol.Collection([layer]), - renderer: ol.RendererHint.DOM, - target: 'domMap', - view: view -}); - var domMousePosition = new ol.control.MousePosition({ coordinateFormat: ol.Coordinate.toStringHDMS, projection: ol.projection.getFromCode('EPSG:4326'), target: document.getElementById('domMousePosition'), undefinedHTML: ' ' }); -domMousePosition.setMap(domMap); +var domMap = new ol.Map({ + controls: ol.control.defaults({}, domMousePosition), + layers: new ol.Collection([layer]), + renderer: ol.RendererHint.DOM, + target: 'domMap', + view: view +}); +var webglMousePosition = new ol.control.MousePosition({ + coordinateFormat: ol.Coordinate.toStringHDMS, + projection: ol.projection.getFromCode('EPSG:4326'), + target: document.getElementById('webglMousePosition'), + undefinedHTML: ' ' +}); var webglMap = new ol.Map({ + controls: ol.control.defaults({}, webglMousePosition), renderer: ol.RendererHint.WEBGL, target: 'webglMap' }); @@ -50,22 +57,6 @@ if (webglMap !== null) { webglMap.bindTo('view', domMap); } -var webglMousePosition = new ol.control.MousePosition({ - coordinateFormat: ol.Coordinate.toStringHDMS, - projection: ol.projection.getFromCode('EPSG:4326'), - target: document.getElementById('webglMousePosition'), - undefinedHTML: ' ' -}); -webglMousePosition.setMap(webglMap); - -var canvasMap = new ol.Map({ - renderer: ol.RendererHint.CANVAS, - target: 'canvasMap' -}); -if (canvasMap !== null) { - canvasMap.bindTo('layers', domMap); - canvasMap.bindTo('view', domMap); -} var canvasMousePosition = new ol.control.MousePosition({ coordinateFormat: ol.Coordinate.toStringHDMS, @@ -73,7 +64,15 @@ var canvasMousePosition = new ol.control.MousePosition({ target: document.getElementById('canvasMousePosition'), undefinedHtml: ' ' }); -canvasMousePosition.setMap(canvasMap); +var canvasMap = new ol.Map({ + controls: ol.control.defaults({}, canvasMousePosition), + renderer: ol.RendererHint.CANVAS, + target: 'canvasMap' +}); +if (canvasMap !== null) { + canvasMap.bindTo('layers', domMap); + canvasMap.bindTo('view', domMap); +} var keyboardInteraction = new ol.interaction.Keyboard(); keyboardInteraction.addCallback('0', function() { diff --git a/examples/stamen.js b/examples/stamen.js index 3c947baf84..233c04cdb8 100644 --- a/examples/stamen.js +++ b/examples/stamen.js @@ -22,7 +22,6 @@ var layers = new ol.Collection([ var map = new ol.Map({ layers: layers, renderers: ol.RendererHints.createFromQueryData(), - scaleLineControl: true, target: 'map', view: new ol.View2D({ center: new ol.Coordinate(0, 0),