diff --git a/examples/accessible.js b/examples/accessible.js index fbef5217cc..6ce87edac0 100644 --- a/examples/accessible.js +++ b/examples/accessible.js @@ -13,9 +13,9 @@ var map = new ol.Map({ ], target: 'map', controls: ol.control.defaults({ - attributionOptions: /** @type {olx.control.AttributionOptions} */ ({ + attributionOptions: { collapsible: false - }) + } }), view: new ol.View({ center: [0, 0], diff --git a/examples/canvas-tiles.js b/examples/canvas-tiles.js index fa3a3eb15c..36050dca6d 100644 --- a/examples/canvas-tiles.js +++ b/examples/canvas-tiles.js @@ -22,9 +22,9 @@ var map = new ol.Map({ ], target: 'map', controls: ol.control.defaults({ - attributionOptions: /** @type {olx.control.AttributionOptions} */ ({ + attributionOptions: { collapsible: false - }) + } }), view: new ol.View({ center: ol.proj.transform( diff --git a/examples/center.js b/examples/center.js index 1c813ad788..c77f763f53 100644 --- a/examples/center.js +++ b/examples/center.js @@ -51,9 +51,9 @@ var map = new ol.Map({ ], target: 'map', controls: ol.control.defaults({ - attributionOptions: /** @type {olx.control.AttributionOptions} */ ({ + attributionOptions: { collapsible: false - }) + } }), view: view }); diff --git a/examples/custom-controls.js b/examples/custom-controls.js index c2083fd7ad..d31c2d2a4a 100644 --- a/examples/custom-controls.js +++ b/examples/custom-controls.js @@ -59,9 +59,9 @@ ol.inherits(app.RotateNorthControl, ol.control.Control); var map = new ol.Map({ controls: ol.control.defaults({ - attributionOptions: /** @type {olx.control.AttributionOptions} */ ({ + attributionOptions: { collapsible: false - }) + } }).extend([ new app.RotateNorthControl() ]), diff --git a/examples/custom-interactions.js b/examples/custom-interactions.js index c5a447059c..b0f6f952f7 100644 --- a/examples/custom-interactions.js +++ b/examples/custom-interactions.js @@ -92,8 +92,7 @@ app.Drag.prototype.handleDragEvent = function(evt) { var deltaX = evt.coordinate[0] - this.coordinate_[0]; var deltaY = evt.coordinate[1] - this.coordinate_[1]; - var geometry = /** @type {ol.geom.SimpleGeometry} */ - (this.feature_.getGeometry()); + var geometry = this.feature_.getGeometry(); geometry.translate(deltaX, deltaY); this.coordinate_[0] = evt.coordinate[0]; diff --git a/examples/device-orientation.js b/examples/device-orientation.js index 5cdce0a698..1be0336b10 100644 --- a/examples/device-orientation.js +++ b/examples/device-orientation.js @@ -22,9 +22,9 @@ var map = new ol.Map({ ], target: 'map', controls: ol.control.defaults({ - attributionOptions: /** @type {olx.control.AttributionOptions} */ ({ + attributionOptions: { collapsible: false - }) + } }), view: view }); diff --git a/examples/export-map.js b/examples/export-map.js index a4843f3741..d96475a82d 100644 --- a/examples/export-map.js +++ b/examples/export-map.js @@ -23,9 +23,9 @@ var map = new ol.Map({ ], target: 'map', controls: ol.control.defaults({ - attributionOptions: /** @type {olx.control.AttributionOptions} */ ({ + attributionOptions: { collapsible: false - }) + } }), view: new ol.View({ center: [0, 0], diff --git a/examples/export-pdf.js b/examples/export-pdf.js index 857dffc49d..ff253f1f94 100644 --- a/examples/export-pdf.js +++ b/examples/export-pdf.js @@ -30,9 +30,9 @@ var map = new ol.Map({ layers: [raster, vector], target: 'map', controls: ol.control.defaults({ - attributionOptions: /** @type {olx.control.AttributionOptions} */ ({ + attributionOptions: { collapsible: false - }) + } }), view: new ol.View({ center: [0, 0], diff --git a/examples/feature-animation.js b/examples/feature-animation.js index 536c850313..d04e741717 100644 --- a/examples/feature-animation.js +++ b/examples/feature-animation.js @@ -24,9 +24,9 @@ var map = new ol.Map({ }) ], controls: ol.control.defaults({ - attributionOptions: /** @type {olx.control.AttributionOptions} */ ({ + attributionOptions: { collapsible: false - }) + } }), target: 'map', view: new ol.View({ diff --git a/examples/geojson.js b/examples/geojson.js index f0bb72c7d5..fe76499fd7 100644 --- a/examples/geojson.js +++ b/examples/geojson.js @@ -180,9 +180,9 @@ var map = new ol.Map({ ], target: 'map', controls: ol.control.defaults({ - attributionOptions: /** @type {olx.control.AttributionOptions} */ ({ + attributionOptions: { collapsible: false - }) + } }), view: new ol.View({ center: [0, 0], diff --git a/examples/geolocation-orientation.js b/examples/geolocation-orientation.js index 17c0eefeda..3edfe41bf5 100644 --- a/examples/geolocation-orientation.js +++ b/examples/geolocation-orientation.js @@ -23,9 +23,9 @@ var map = new ol.Map({ ], target: 'map', controls: ol.control.defaults({ - attributionOptions: /** @type {olx.control.AttributionOptions} */ ({ + attributionOptions: { collapsible: false - }) + } }), view: view }); @@ -46,14 +46,14 @@ var positions = new ol.geom.LineString([], /** @type {ol.geom.GeometryLayout} */ ('XYZM')); // Geolocation Control -var geolocation = new ol.Geolocation(/** @type {olx.GeolocationOptions} */ ({ +var geolocation = new ol.Geolocation({ projection: view.getProjection(), trackingOptions: { maximumAge: 10000, enableHighAccuracy: true, timeout: 600000 } -})); +}); var deltaMean = 500; // the geolocation sampling period mean in ms diff --git a/examples/geolocation.js b/examples/geolocation.js index bfe2a165cd..b17bcbe10f 100644 --- a/examples/geolocation.js +++ b/examples/geolocation.js @@ -26,9 +26,9 @@ var map = new ol.Map({ ], target: 'map', controls: ol.control.defaults({ - attributionOptions: /** @type {olx.control.AttributionOptions} */ ({ + attributionOptions: { collapsible: false - }) + } }), view: view }); diff --git a/examples/igc.js b/examples/igc.js index babe987fe1..f8f1cb2df7 100644 --- a/examples/igc.js +++ b/examples/igc.js @@ -99,9 +99,9 @@ var map = new ol.Map({ ], target: 'map', controls: ol.control.defaults({ - attributionOptions: /** @type {olx.control.AttributionOptions} */ ({ + attributionOptions: { collapsible: false - }) + } }), view: new ol.View({ center: [703365.7089403362, 5714629.865071137], diff --git a/examples/layer-clipping-webgl.js b/examples/layer-clipping-webgl.js index 70b4d99c7f..53581f97c9 100644 --- a/examples/layer-clipping-webgl.js +++ b/examples/layer-clipping-webgl.js @@ -22,9 +22,9 @@ if (!ol.has.WEBGL) { renderer: /** @type {Array} */ (['webgl', 'canvas']), target: 'map', controls: ol.control.defaults({ - attributionOptions: /** @type {olx.control.AttributionOptions} */ ({ + attributionOptions: { collapsible: false - }) + } }), view: new ol.View({ center: [0, 0], diff --git a/examples/layer-clipping.js b/examples/layer-clipping.js index 7bf68cd908..3047eed841 100644 --- a/examples/layer-clipping.js +++ b/examples/layer-clipping.js @@ -12,9 +12,9 @@ var map = new ol.Map({ layers: [osm], target: 'map', controls: ol.control.defaults({ - attributionOptions: /** @type {olx.control.AttributionOptions} */ ({ + attributionOptions: { collapsible: false - }) + } }), view: new ol.View({ center: [0, 0], diff --git a/examples/layer-swipe.js b/examples/layer-swipe.js index c0c829e517..c4c014b58c 100644 --- a/examples/layer-swipe.js +++ b/examples/layer-swipe.js @@ -19,9 +19,9 @@ var map = new ol.Map({ layers: [osm, bing], target: 'map', controls: ol.control.defaults({ - attributionOptions: /** @type {olx.control.AttributionOptions} */ ({ + attributionOptions: { collapsible: false - }) + } }), view: new ol.View({ center: [0, 0], diff --git a/examples/localized-openstreetmap.js b/examples/localized-openstreetmap.js index 26587abc1c..71d72d517d 100644 --- a/examples/localized-openstreetmap.js +++ b/examples/localized-openstreetmap.js @@ -35,9 +35,9 @@ var map = new ol.Map({ ], target: 'map', controls: ol.control.defaults({ - attributionOptions: /** @type {olx.control.AttributionOptions} */ ({ + attributionOptions: { collapsible: false - }) + } }), view: new ol.View({ maxZoom: 18, diff --git a/examples/min-max-resolution.js b/examples/min-max-resolution.js index 6e07336001..d24e5ceabe 100644 --- a/examples/min-max-resolution.js +++ b/examples/min-max-resolution.js @@ -27,9 +27,9 @@ var map = new ol.Map({ ], target: 'map', controls: ol.control.defaults({ - attributionOptions: /** @type {olx.control.AttributionOptions} */ ({ + attributionOptions: { collapsible: false - }) + } }), view: new ol.View({ center: [653600, 5723680], diff --git a/examples/mouse-position.js b/examples/mouse-position.js index 4f4ca98c3d..c80afc5c76 100644 --- a/examples/mouse-position.js +++ b/examples/mouse-position.js @@ -18,9 +18,9 @@ var mousePositionControl = new ol.control.MousePosition({ var map = new ol.Map({ controls: ol.control.defaults({ - attributionOptions: /** @type {olx.control.AttributionOptions} */ ({ + attributionOptions: { collapsible: false - }) + } }).extend([mousePositionControl]), layers: [ new ol.layer.Tile({ diff --git a/examples/moveend.js b/examples/moveend.js index b190d50a54..be2c34a319 100644 --- a/examples/moveend.js +++ b/examples/moveend.js @@ -15,9 +15,9 @@ var map = new ol.Map({ ], target: 'map', controls: ol.control.defaults({ - attributionOptions: /** @type {olx.control.AttributionOptions} */ ({ + attributionOptions: { collapsible: false - }) + } }), view: new ol.View({ center: [0, 0], diff --git a/examples/navigation-controls.js b/examples/navigation-controls.js index f55377ae33..ea1fd3af74 100644 --- a/examples/navigation-controls.js +++ b/examples/navigation-controls.js @@ -8,9 +8,9 @@ goog.require('ol.source.OSM'); var map = new ol.Map({ controls: ol.control.defaults({ - attributionOptions: /** @type {olx.control.AttributionOptions} */ ({ + attributionOptions: { collapsible: false - }) + } }).extend([ new ol.control.ZoomToExtent({ extent: [ diff --git a/examples/permalink.js b/examples/permalink.js index 9ee2c5ba6c..181ee061e5 100644 --- a/examples/permalink.js +++ b/examples/permalink.js @@ -30,9 +30,9 @@ var map = new ol.Map({ }) ], controls: ol.control.defaults({ - attributionOptions: /** @type {olx.control.AttributionOptions} */ ({ + attributionOptions: { collapsible: false - }) + } }), target: 'map', view: new ol.View({ diff --git a/examples/popup.js b/examples/popup.js index 93668a3900..26d5196bae 100644 --- a/examples/popup.js +++ b/examples/popup.js @@ -18,13 +18,13 @@ var closer = document.getElementById('popup-closer'); /** * Create an overlay to anchor the popup to the map. */ -var overlay = new ol.Overlay(/** @type {olx.OverlayOptions} */ ({ +var overlay = new ol.Overlay({ element: container, autoPan: true, autoPanAnimation: { duration: 250 } -})); +}); /** diff --git a/examples/rotation.js b/examples/rotation.js index 8c689bfb70..afaacb521b 100644 --- a/examples/rotation.js +++ b/examples/rotation.js @@ -13,9 +13,9 @@ var map = new ol.Map({ ], target: 'map', controls: ol.control.defaults({ - attributionOptions: /** @type {olx.control.AttributionOptions} */ ({ + attributionOptions: { collapsible: false - }) + } }), view: new ol.View({ center: [14200000, 4130000], diff --git a/examples/scale-line.js b/examples/scale-line.js index 45de9b6185..c8dbf41e7f 100644 --- a/examples/scale-line.js +++ b/examples/scale-line.js @@ -10,9 +10,9 @@ var scaleLineControl = new ol.control.ScaleLine(); var map = new ol.Map({ controls: ol.control.defaults({ - attributionOptions: /** @type {olx.control.AttributionOptions} */ ({ + attributionOptions: { collapsible: false - }) + } }).extend([ scaleLineControl ]), diff --git a/examples/teleport.js b/examples/teleport.js index b1a123c83c..9a55da9356 100644 --- a/examples/teleport.js +++ b/examples/teleport.js @@ -12,9 +12,9 @@ var map = new ol.Map({ }) ], controls: ol.control.defaults({ - attributionOptions: /** @type {olx.control.AttributionOptions} */ ({ + attributionOptions: { collapsible: false - }) + } }), view: new ol.View({ center: [0, 0], diff --git a/examples/vector-osm.js b/examples/vector-osm.js index 55adfd23d9..8eaa252ab5 100644 --- a/examples/vector-osm.js +++ b/examples/vector-osm.js @@ -127,9 +127,9 @@ map = new ol.Map({ layers: [raster, vector], target: document.getElementById('map'), controls: ol.control.defaults({ - attributionOptions: /** @type {olx.control.AttributionOptions} */ ({ + attributionOptions: { collapsible: false - }) + } }), view: new ol.View({ center: [739218, 5906096], diff --git a/examples/wms-image-custom-proj.js b/examples/wms-image-custom-proj.js index 900e6fb1f5..bc1c738701 100644 --- a/examples/wms-image-custom-proj.js +++ b/examples/wms-image-custom-proj.js @@ -41,7 +41,7 @@ var layers = [ 'LAYERS': 'ch.swisstopo.pixelkarte-farbe-pk1000.noscale', 'FORMAT': 'image/jpeg' }, - serverType: /** @type {ol.source.WMSServerType} */ ('mapserver') + serverType: 'mapserver' }) }), new ol.layer.Image({ @@ -52,7 +52,7 @@ var layers = [ attributions: '© National parks / geo.admin.ch', params: {'LAYERS': 'ch.bafu.schutzgebiete-paerke_nationaler_bedeutung'}, - serverType: /** @type {ol.source.WMSServerType} */ ('mapserver') + serverType: 'mapserver' }) }) ]; diff --git a/examples/wms-time.js b/examples/wms-time.js index 5ec676e768..bed8b05b33 100644 --- a/examples/wms-time.js +++ b/examples/wms-time.js @@ -23,11 +23,11 @@ var layers = [ }), new ol.layer.Tile({ extent: extent, - source: new ol.source.TileWMS(/** @type {olx.source.TileWMSOptions} */ ({ + source: new ol.source.TileWMS({ attributions: ['Iowa State University'], url: 'https://mesonet.agron.iastate.edu/cgi-bin/wms/nexrad/n0r-t.cgi', params: {'LAYERS': 'nexrad-n0r-wmst'} - })) + }) }) ]; var map = new ol.Map({ diff --git a/examples/wmts-ign.js b/examples/wmts-ign.js index 46931fb3c9..2e3dc155ed 100644 --- a/examples/wmts-ign.js +++ b/examples/wmts-ign.js @@ -11,9 +11,9 @@ goog.require('ol.tilegrid.WMTS'); var map = new ol.Map({ target: 'map', controls: ol.control.defaults({ - attributionOptions: /** @type {olx.control.AttributionOptions} */ ({ + attributionOptions: { collapsible: false - }) + } }), view: new ol.View({ zoom: 5, diff --git a/examples/wmts.js b/examples/wmts.js index 89aaba98b3..243cdc38ee 100644 --- a/examples/wmts.js +++ b/examples/wmts.js @@ -49,9 +49,9 @@ var map = new ol.Map({ ], target: 'map', controls: ol.control.defaults({ - attributionOptions: /** @type {olx.control.AttributionOptions} */ ({ + attributionOptions: { collapsible: false - }) + } }), view: new ol.View({ center: [-11158582, 4813697],