diff --git a/config/examples/readme.md b/config/examples/readme.md index 583975e6c1..e3bf64c9db 100644 --- a/config/examples/readme.md +++ b/config/examples/readme.md @@ -14,7 +14,7 @@ To enable this, examples have the following, not needed in application code: * some js files use type definitions (comments with @type tags); these are also used by the compiler, and are only needed if the code is to be compiled together with the library - * html files load `resources/common.js` and some js files define the Map renderer option as `exampleNS.getRendererFromQueryString()`; application code would not need these + * html files load `resources/common.js` and some scripts use `common.getRendererFromQueryString()` to set the map renderer; application code would not need these * in addition, examples use Twitter Bootstrap and jQuery; this is of course not a requirement - you may use whichever presentation/helper libraries you wish diff --git a/examples/accessible.js b/examples/accessible.js index 90539b70cf..f41e94546f 100644 --- a/examples/accessible.js +++ b/examples/accessible.js @@ -11,7 +11,7 @@ var map = new ol.Map({ source: new ol.source.OSM() }) ], - renderer: exampleNS.getRendererFromQueryString(), + renderer: common.getRendererFromQueryString(), target: 'map', controls: ol.control.defaults({ attributionOptions: /** @type {olx.control.AttributionOptions} */ ({ diff --git a/examples/animation.js b/examples/animation.js index f79b93c60e..dd8e784ab5 100644 --- a/examples/animation.js +++ b/examples/animation.js @@ -54,7 +54,7 @@ var map = new ol.Map({ source: new ol.source.OSM() }) ], - renderer: exampleNS.getRendererFromQueryString(), + renderer: common.getRendererFromQueryString(), // Improve user experience by loading tiles while animating. Will make // animations stutter on mobile or slow devices. loadTilesWhileAnimating: true, diff --git a/examples/attributions.js b/examples/attributions.js index c9c56067a3..7b6a7c5865 100644 --- a/examples/attributions.js +++ b/examples/attributions.js @@ -15,7 +15,7 @@ var map = new ol.Map({ }) ], controls: ol.control.defaults({ attribution: false }).extend([attribution]), - renderer: exampleNS.getRendererFromQueryString(), + renderer: common.getRendererFromQueryString(), target: 'map', view: new ol.View({ center: [0, 0], diff --git a/examples/bing-maps.js b/examples/bing-maps.js index a53560b66c..ca3726ad9b 100644 --- a/examples/bing-maps.js +++ b/examples/bing-maps.js @@ -28,7 +28,7 @@ for (i = 0, ii = styles.length; i < ii; ++i) { } var map = new ol.Map({ layers: layers, - renderer: exampleNS.getRendererFromQueryString(), + renderer: common.getRendererFromQueryString(), // Improve user experience by loading tiles while dragging/zooming. Will make // zooming choppy on mobile or slow devices. loadTilesWhileInteracting: true, diff --git a/examples/button-title.js b/examples/button-title.js index b7ae541d85..bbb547cd9a 100644 --- a/examples/button-title.js +++ b/examples/button-title.js @@ -9,7 +9,7 @@ var map = new ol.Map({ source: new ol.source.OSM() }) ], - renderer: exampleNS.getRendererFromQueryString(), + renderer: common.getRendererFromQueryString(), target: 'map', view: new ol.View({ center: [-8730000, 5930000], diff --git a/examples/canvas-tiles.js b/examples/canvas-tiles.js index 278fe22e31..1f46f51e0f 100644 --- a/examples/canvas-tiles.js +++ b/examples/canvas-tiles.js @@ -22,7 +22,7 @@ var map = new ol.Map({ }) }) ], - renderer: exampleNS.getRendererFromQueryString(), + renderer: common.getRendererFromQueryString(), target: 'map', controls: ol.control.defaults({ attributionOptions: /** @type {olx.control.AttributionOptions} */ ({ diff --git a/examples/custom-controls.js b/examples/custom-controls.js index 3da26b4805..b1bf0ad2bc 100644 --- a/examples/custom-controls.js +++ b/examples/custom-controls.js @@ -71,7 +71,7 @@ var map = new ol.Map({ source: new ol.source.OSM() }) ], - renderer: exampleNS.getRendererFromQueryString(), + renderer: common.getRendererFromQueryString(), target: 'map', view: new ol.View({ center: [0, 0], diff --git a/examples/device-orientation.js b/examples/device-orientation.js index 44d2d908a7..903ba0c1a4 100644 --- a/examples/device-orientation.js +++ b/examples/device-orientation.js @@ -19,7 +19,7 @@ var map = new ol.Map({ source: new ol.source.OSM() }) ], - renderer: exampleNS.getRendererFromQueryString(), + renderer: common.getRendererFromQueryString(), target: 'map', controls: ol.control.defaults({ attributionOptions: /** @type {olx.control.AttributionOptions} */ ({ diff --git a/examples/drag-and-drop-image-vector.js b/examples/drag-and-drop-image-vector.js index 6e35336d4c..ce9561924c 100644 --- a/examples/drag-and-drop-image-vector.js +++ b/examples/drag-and-drop-image-vector.js @@ -104,7 +104,7 @@ var map = new ol.Map({ }) }) ], - renderer: exampleNS.getRendererFromQueryString(), + renderer: common.getRendererFromQueryString(), target: 'map', view: new ol.View({ center: [0, 0], diff --git a/examples/drag-rotate-and-zoom.js b/examples/drag-rotate-and-zoom.js index 50dd2f1837..8449a52333 100644 --- a/examples/drag-rotate-and-zoom.js +++ b/examples/drag-rotate-and-zoom.js @@ -15,7 +15,7 @@ var map = new ol.Map({ source: new ol.source.MapQuest({layer: 'sat'}) }) ], - renderer: exampleNS.getRendererFromQueryString(), + renderer: common.getRendererFromQueryString(), target: 'map', view: new ol.View({ center: [0, 0], diff --git a/examples/draw-features.js b/examples/draw-features.js index 603cbfcfa5..1a25d6874e 100644 --- a/examples/draw-features.js +++ b/examples/draw-features.js @@ -37,7 +37,7 @@ var vector = new ol.layer.Vector({ var map = new ol.Map({ layers: [raster, vector], - renderer: exampleNS.getRendererFromQueryString(), + renderer: common.getRendererFromQueryString(), target: 'map', view: new ol.View({ center: [-11000000, 4600000], diff --git a/examples/dynamic-data.js b/examples/dynamic-data.js index 793d4ef761..26f4f3fc1c 100644 --- a/examples/dynamic-data.js +++ b/examples/dynamic-data.js @@ -17,7 +17,7 @@ var map = new ol.Map({ source: new ol.source.MapQuest({layer: 'sat'}) }) ], - renderer: exampleNS.getRendererFromQueryString(), + renderer: common.getRendererFromQueryString(), target: 'map', view: new ol.View({ center: [0, 0], diff --git a/examples/full-screen.js b/examples/full-screen.js index f23b983b65..1542fce438 100644 --- a/examples/full-screen.js +++ b/examples/full-screen.js @@ -23,7 +23,7 @@ var map = new ol.Map({ }) }) ], - renderer: exampleNS.getRendererFromQueryString(), + renderer: common.getRendererFromQueryString(), target: 'map', view: view }); diff --git a/examples/getfeatureinfo-image.js b/examples/getfeatureinfo-image.js index 316fda17bc..5f71f9acb5 100644 --- a/examples/getfeatureinfo-image.js +++ b/examples/getfeatureinfo-image.js @@ -21,7 +21,7 @@ var view = new ol.View({ }); var map = new ol.Map({ - renderer: exampleNS.getRendererFromQueryString(), + renderer: common.getRendererFromQueryString(), layers: [wmsLayer], target: 'map', view: view diff --git a/examples/getfeatureinfo-tile.js b/examples/getfeatureinfo-tile.js index 022606b611..7119136b40 100644 --- a/examples/getfeatureinfo-tile.js +++ b/examples/getfeatureinfo-tile.js @@ -21,7 +21,7 @@ var view = new ol.View({ }); var map = new ol.Map({ - renderer: exampleNS.getRendererFromQueryString(), + renderer: common.getRendererFromQueryString(), layers: [wmsLayer], target: 'map', view: view diff --git a/examples/gpx.js b/examples/gpx.js index 02257ad9b8..f08929c7e4 100644 --- a/examples/gpx.js +++ b/examples/gpx.js @@ -109,7 +109,7 @@ if ('download' in exportGPXElement) { features.push(clone); }); var string = new ol.format.GPX().writeFeatures(features); - var base64 = exampleNS.strToBase64(string); + var base64 = common.strToBase64(string); exportGPXElement.href = 'data:text/gpx+xml;base64,' + base64; } diff --git a/examples/icon-sprite-webgl.js b/examples/icon-sprite-webgl.js index 8487020b8b..ffda56a325 100644 --- a/examples/icon-sprite-webgl.js +++ b/examples/icon-sprite-webgl.js @@ -80,7 +80,7 @@ var vector = new ol.layer.Vector({ }); // Use the "webgl" renderer by default. -var renderer = exampleNS.getRendererFromQueryString(); +var renderer = common.getRendererFromQueryString(); if (!renderer) { renderer = 'webgl'; } diff --git a/examples/icon.js b/examples/icon.js index f435b0f0b5..0ec6f9baba 100644 --- a/examples/icon.js +++ b/examples/icon.js @@ -46,7 +46,7 @@ var rasterLayer = new ol.layer.Tile({ }); var map = new ol.Map({ - renderer: exampleNS.getRendererFromQueryString(), + renderer: common.getRendererFromQueryString(), layers: [rasterLayer, vectorLayer], target: document.getElementById('map'), view: new ol.View({ diff --git a/examples/image-load-events.js b/examples/image-load-events.js index c82a5b9988..293810f89f 100644 --- a/examples/image-load-events.js +++ b/examples/image-load-events.js @@ -96,7 +96,7 @@ var map = new ol.Map({ layers: [ new ol.layer.Image({source: source}) ], - renderer: exampleNS.getRendererFromQueryString(), + renderer: common.getRendererFromQueryString(), target: 'map', view: new ol.View({ center: [-10997148, 4569099], diff --git a/examples/kml.js b/examples/kml.js index 90eae50ea1..47d45f3579 100644 --- a/examples/kml.js +++ b/examples/kml.js @@ -77,7 +77,7 @@ if ('download' in exportKMLElement) { features.push(clone); }); var string = new ol.format.KML().writeFeatures(features); - var base64 = exampleNS.strToBase64(string); + var base64 = common.strToBase64(string); exportKMLElement.href = 'data:application/vnd.google-earth.kml+xml;base64,' + base64; } diff --git a/examples/layer-extent.js b/examples/layer-extent.js index fca59929fa..cee45691af 100644 --- a/examples/layer-extent.js +++ b/examples/layer-extent.js @@ -35,7 +35,7 @@ var overlay = new ol.layer.Tile({ var map = new ol.Map({ layers: [base, overlay], - renderer: exampleNS.getRendererFromQueryString(), + renderer: common.getRendererFromQueryString(), target: 'map', view: new ol.View({ center: [0, 0], diff --git a/examples/layer-group.js b/examples/layer-group.js index 807813e53d..701feb38c3 100644 --- a/examples/layer-group.js +++ b/examples/layer-group.js @@ -29,7 +29,7 @@ var map = new ol.Map({ ] }) ], - renderer: exampleNS.getRendererFromQueryString(), + renderer: common.getRendererFromQueryString(), target: 'map', view: new ol.View({ center: ol.proj.fromLonLat([37.40570, 8.81566]), diff --git a/examples/lazy-source.js b/examples/lazy-source.js index b53347bb80..920bc46066 100644 --- a/examples/lazy-source.js +++ b/examples/lazy-source.js @@ -9,7 +9,7 @@ var layer = new ol.layer.Tile(); var map = new ol.Map({ layers: [layer], - renderer: exampleNS.getRendererFromQueryString(), + renderer: common.getRendererFromQueryString(), target: 'map', view: new ol.View({ center: [0, 0], diff --git a/examples/line-arrows.js b/examples/line-arrows.js index 90f810acfa..b03d110437 100644 --- a/examples/line-arrows.js +++ b/examples/line-arrows.js @@ -53,7 +53,7 @@ var vector = new ol.layer.Vector({ var map = new ol.Map({ layers: [raster, vector], - renderer: exampleNS.getRendererFromQueryString(), + renderer: common.getRendererFromQueryString(), target: 'map', view: new ol.View({ center: [-11000000, 4600000], diff --git a/examples/mapquest.js b/examples/mapquest.js index f2bdf0246e..d530342894 100644 --- a/examples/mapquest.js +++ b/examples/mapquest.js @@ -32,7 +32,7 @@ var layers = [ var map = new ol.Map({ layers: layers, - renderer: exampleNS.getRendererFromQueryString(), + renderer: common.getRendererFromQueryString(), target: 'map', view: new ol.View({ center: ol.proj.transform( diff --git a/examples/min-max-resolution.js b/examples/min-max-resolution.js index 6bfe03a9b5..f251269708 100644 --- a/examples/min-max-resolution.js +++ b/examples/min-max-resolution.js @@ -26,7 +26,7 @@ var map = new ol.Map({ maxResolution: 20000 }) ], - renderer: exampleNS.getRendererFromQueryString(), + renderer: common.getRendererFromQueryString(), target: 'map', controls: ol.control.defaults({ attributionOptions: /** @type {olx.control.AttributionOptions} */ ({ diff --git a/examples/mobile-full-screen.js b/examples/mobile-full-screen.js index 7d938b267a..1a59871c4f 100644 --- a/examples/mobile-full-screen.js +++ b/examples/mobile-full-screen.js @@ -19,7 +19,7 @@ var map = new ol.Map({ }) }) ], - renderer: exampleNS.getRendererFromQueryString(), + renderer: common.getRendererFromQueryString(), target: 'map', view: view }); diff --git a/examples/mouse-position.js b/examples/mouse-position.js index 9f4a4107fa..91bcc085bd 100644 --- a/examples/mouse-position.js +++ b/examples/mouse-position.js @@ -28,7 +28,7 @@ var map = new ol.Map({ source: new ol.source.OSM() }) ], - renderer: exampleNS.getRendererFromQueryString(), + renderer: common.getRendererFromQueryString(), target: 'map', view: new ol.View({ center: [0, 0], diff --git a/examples/moveend.js b/examples/moveend.js index 1f2799bfcd..37642ffa7c 100644 --- a/examples/moveend.js +++ b/examples/moveend.js @@ -13,7 +13,7 @@ var map = new ol.Map({ source: new ol.source.OSM() }) ], - renderer: exampleNS.getRendererFromQueryString(), + renderer: common.getRendererFromQueryString(), target: 'map', controls: ol.control.defaults({ attributionOptions: /** @type {olx.control.AttributionOptions} */ ({ diff --git a/examples/navigation-controls.js b/examples/navigation-controls.js index cc9034a747..ef9ee01298 100644 --- a/examples/navigation-controls.js +++ b/examples/navigation-controls.js @@ -24,7 +24,7 @@ var map = new ol.Map({ source: new ol.source.OSM() }) ], - renderer: exampleNS.getRendererFromQueryString(), + renderer: common.getRendererFromQueryString(), target: 'map', view: new ol.View({ center: [0, 0], diff --git a/examples/overlay.js b/examples/overlay.js index 8ede9224bd..24b1f2ad6d 100644 --- a/examples/overlay.js +++ b/examples/overlay.js @@ -13,7 +13,7 @@ var layer = new ol.layer.Tile({ var map = new ol.Map({ layers: [layer], - renderer: exampleNS.getRendererFromQueryString(), + renderer: common.getRendererFromQueryString(), target: 'map', view: new ol.View({ center: [0, 0], diff --git a/examples/popup.js b/examples/popup.js index be01b0c29a..fe619a2db6 100644 --- a/examples/popup.js +++ b/examples/popup.js @@ -51,7 +51,7 @@ var map = new ol.Map({ }) }) ], - renderer: exampleNS.getRendererFromQueryString(), + renderer: common.getRendererFromQueryString(), overlays: [overlay], target: 'map', view: new ol.View({ diff --git a/examples/preload.js b/examples/preload.js index 1c4d71164e..fdcbd84b37 100644 --- a/examples/preload.js +++ b/examples/preload.js @@ -19,7 +19,7 @@ var map1 = new ol.Map({ }) }) ], - renderer: exampleNS.getRendererFromQueryString(), + renderer: common.getRendererFromQueryString(), target: 'map1', view: view }); @@ -34,7 +34,7 @@ var map2 = new ol.Map({ }) }) ], - renderer: exampleNS.getRendererFromQueryString(), + renderer: common.getRendererFromQueryString(), target: 'map2', view: view }); diff --git a/examples/resources/common.js b/examples/resources/common.js index 91411c97b9..aa8da6de1e 100644 --- a/examples/resources/common.js +++ b/examples/resources/common.js @@ -73,9 +73,9 @@ container.appendChild(form); })(); -var exampleNS = {}; +var common = {}; -exampleNS.getRendererFromQueryString = function() { +common.getRendererFromQueryString = function() { var obj = {}; var queryString = location.search.slice(1); var re = /([^&=]+)=([^&]*)/g; @@ -265,6 +265,6 @@ function strToUTF8Arr (sDOMStr) { } -exampleNS.strToBase64 = function(str) { +common.strToBase64 = function(str) { return base64EncArr(strToUTF8Arr(str)); }; diff --git a/examples/rotation.js b/examples/rotation.js index 4fa63b6b28..52978be4c7 100644 --- a/examples/rotation.js +++ b/examples/rotation.js @@ -11,7 +11,7 @@ var map = new ol.Map({ source: new ol.source.OSM() }) ], - renderer: exampleNS.getRendererFromQueryString(), + renderer: common.getRendererFromQueryString(), target: 'map', controls: ol.control.defaults({ attributionOptions: /** @type {olx.control.AttributionOptions} */ ({ diff --git a/examples/scale-line.js b/examples/scale-line.js index 92db5db61a..6ad5b160e4 100644 --- a/examples/scale-line.js +++ b/examples/scale-line.js @@ -21,7 +21,7 @@ var map = new ol.Map({ source: new ol.source.OSM() }) ], - renderer: exampleNS.getRendererFromQueryString(), + renderer: common.getRendererFromQueryString(), target: 'map', view: new ol.View({ center: [0, 0], diff --git a/examples/semi-transparent-layer.js b/examples/semi-transparent-layer.js index c4e67d0240..5d019a3f4b 100644 --- a/examples/semi-transparent-layer.js +++ b/examples/semi-transparent-layer.js @@ -18,7 +18,7 @@ var map = new ol.Map({ }) }) ], - renderer: exampleNS.getRendererFromQueryString(), + renderer: common.getRendererFromQueryString(), target: 'map', view: new ol.View({ center: ol.proj.fromLonLat([-77.93255, 37.9555]), diff --git a/examples/simple.js b/examples/simple.js index accd01a5f4..a2d0ca761b 100644 --- a/examples/simple.js +++ b/examples/simple.js @@ -16,7 +16,7 @@ var map = new ol.Map({ collapsible: false }) }), - renderer: exampleNS.getRendererFromQueryString(), + renderer: common.getRendererFromQueryString(), target: 'map', view: new ol.View({ center: [0, 0], diff --git a/examples/stamen.js b/examples/stamen.js index 09ef7918f4..1dc14a3957 100644 --- a/examples/stamen.js +++ b/examples/stamen.js @@ -18,7 +18,7 @@ var map = new ol.Map({ }) }) ], - renderer: exampleNS.getRendererFromQueryString(), + renderer: common.getRendererFromQueryString(), target: 'map', view: new ol.View({ center: ol.proj.transform( diff --git a/examples/symbol-atlas-webgl.js b/examples/symbol-atlas-webgl.js index 22423c2adf..df227e2138 100644 --- a/examples/symbol-atlas-webgl.js +++ b/examples/symbol-atlas-webgl.js @@ -107,7 +107,7 @@ var vector = new ol.layer.Vector({ }); // Use the "webgl" renderer by default. -var renderer = exampleNS.getRendererFromQueryString(); +var renderer = common.getRendererFromQueryString(); if (!renderer) { renderer = 'webgl'; } diff --git a/examples/teleport.js b/examples/teleport.js index 3aea72d6b5..9da3eee16c 100644 --- a/examples/teleport.js +++ b/examples/teleport.js @@ -11,7 +11,7 @@ var map = new ol.Map({ source: new ol.source.OSM() }) ], - renderer: exampleNS.getRendererFromQueryString(), + renderer: common.getRendererFromQueryString(), controls: ol.control.defaults({ attributionOptions: /** @type {olx.control.AttributionOptions} */ ({ collapsible: false diff --git a/examples/tile-load-events.js b/examples/tile-load-events.js index 48a6e61f0f..df10f4575e 100644 --- a/examples/tile-load-events.js +++ b/examples/tile-load-events.js @@ -95,7 +95,7 @@ var map = new ol.Map({ layers: [ new ol.layer.Tile({source: source}) ], - renderer: exampleNS.getRendererFromQueryString(), + renderer: common.getRendererFromQueryString(), target: 'map', view: new ol.View({ center: [0, 0], diff --git a/examples/tilejson.js b/examples/tilejson.js index 2c1416ce72..4483f0e43c 100644 --- a/examples/tilejson.js +++ b/examples/tilejson.js @@ -13,7 +13,7 @@ var map = new ol.Map({ }) }) ], - renderer: exampleNS.getRendererFromQueryString(), + renderer: common.getRendererFromQueryString(), target: 'map', view: new ol.View({ center: [0, 0], diff --git a/examples/wms-custom-proj.js b/examples/wms-custom-proj.js index eeb37c9c52..3afa7784e3 100644 --- a/examples/wms-custom-proj.js +++ b/examples/wms-custom-proj.js @@ -86,7 +86,7 @@ var map = new ol.Map({ }) ]), layers: layers, - renderer: exampleNS.getRendererFromQueryString(), + renderer: common.getRendererFromQueryString(), target: 'map', view: new ol.View({ projection: projection, diff --git a/examples/wms-image-custom-proj.js b/examples/wms-image-custom-proj.js index ad2376f306..de5a33df6a 100644 --- a/examples/wms-image-custom-proj.js +++ b/examples/wms-image-custom-proj.js @@ -71,7 +71,7 @@ var map = new ol.Map({ new ol.control.ScaleLine() ]), layers: layers, - renderer: exampleNS.getRendererFromQueryString(), + renderer: common.getRendererFromQueryString(), target: 'map', view: new ol.View({ projection: projection, diff --git a/examples/wms-no-proj.js b/examples/wms-no-proj.js index 6f9bc9038e..f9d9702fa9 100644 --- a/examples/wms-no-proj.js +++ b/examples/wms-no-proj.js @@ -53,7 +53,7 @@ var projection = new ol.proj.Projection({ var map = new ol.Map({ layers: layers, - renderer: exampleNS.getRendererFromQueryString(), + renderer: common.getRendererFromQueryString(), target: 'map', view: new ol.View({ center: [660000, 190000], diff --git a/examples/zoomify.js b/examples/zoomify.js index a33547f79c..f84fc14b69 100644 --- a/examples/zoomify.js +++ b/examples/zoomify.js @@ -40,7 +40,7 @@ var map = new ol.Map({ source: source }) ], - renderer: exampleNS.getRendererFromQueryString(), + renderer: common.getRendererFromQueryString(), target: 'map', view: new ol.View({ projection: proj, diff --git a/externs/example.js b/externs/example.js index 231fb6871f..51bc480083 100644 --- a/externs/example.js +++ b/externs/example.js @@ -1,18 +1,18 @@ /** * @type {Object} */ -var exampleNS; +var common; /** * @return {string} Renderer type. */ -exampleNS.getRendererFromQueryString = function() {}; +common.getRendererFromQueryString = function() {}; /** * @param {string} str String. * @return {string} Base64 string. */ -exampleNS.strToBase64 = function(str) {}; +common.strToBase64 = function(str) {}; diff --git a/tasks/build-examples.js b/tasks/build-examples.js index 633480540c..212b8c04e3 100644 --- a/tasks/build-examples.js +++ b/tasks/build-examples.js @@ -7,7 +7,7 @@ var marked = require('marked'); var pkg = require('../package.json'); var markupRegEx = /([^\/^\.]*)\.html$/; -var cleanupJSRegEx = /.*(goog\.require(.*);|.*renderer: exampleNS\..*,?)[\n]*/g; +var cleanupJSRegEx = /.*(goog\.require(.*);|.*renderer: common\..*,?)[\n]*/g; var isCssRegEx = /\.css$/; var isJsRegEx = /\.js$/;