diff --git a/build.py b/build.py index 70e182e7fe..2e8aa1a668 100755 --- a/build.py +++ b/build.py @@ -325,6 +325,7 @@ def examples_star_json(name, match): '//jquery-1.7.js', '../externs/bingmaps.js', '../externs/bootstrap.js', + '../externs/example.js', '../externs/geojson.js', '../externs/topojson.js', '../externs/oli.js', diff --git a/buildcfg/examples-all.json b/buildcfg/examples-all.json index 4812a4bb65..ef7323f5b9 100644 --- a/buildcfg/examples-all.json +++ b/buildcfg/examples-all.json @@ -5,6 +5,7 @@ "../externs/bingmaps.js", "../externs/bootstrap.js", "../externs/closure-compiler.js", + "../externs/example.js", "../externs/geojson.js", "../externs/oli.js", "../externs/proj4js.js", diff --git a/examples/accessible.html b/examples/accessible.html index 4ca8f48fa5..c5eb97bfc8 100644 --- a/examples/accessible.html +++ b/examples/accessible.html @@ -53,8 +53,8 @@ - + diff --git a/examples/accessible.js b/examples/accessible.js index 07c698b12c..c3c620e350 100644 --- a/examples/accessible.js +++ b/examples/accessible.js @@ -1,5 +1,4 @@ goog.require('ol.Map'); -goog.require('ol.RendererHints'); goog.require('ol.View2D'); goog.require('ol.layer.Tile'); goog.require('ol.source.OSM'); @@ -11,7 +10,7 @@ var map = new ol.Map({ source: new ol.source.OSM() }) ], - renderer: ol.RendererHints.createFromQueryData(), + renderer: exampleNS.getRendererFromQueryString(), target: 'map', view: new ol.View2D({ center: [0, 0], diff --git a/examples/animation.html b/examples/animation.html index a2457641ad..f309780e88 100644 --- a/examples/animation.html +++ b/examples/animation.html @@ -56,8 +56,8 @@ - + diff --git a/examples/animation.js b/examples/animation.js index 2b41c7ccc7..a14ea27954 100644 --- a/examples/animation.js +++ b/examples/animation.js @@ -1,5 +1,4 @@ goog.require('ol.Map'); -goog.require('ol.RendererHints'); goog.require('ol.View2D'); goog.require('ol.animation'); goog.require('ol.easing'); @@ -28,7 +27,7 @@ var map = new ol.Map({ source: new ol.source.OSM() }) ], - renderer: ol.RendererHints.createFromQueryData(), + renderer: exampleNS.getRendererFromQueryString(), target: 'map', view: view }); diff --git a/examples/bind-input.html b/examples/bind-input.html index 4bcb50ee93..f1015f7497 100644 --- a/examples/bind-input.html +++ b/examples/bind-input.html @@ -81,8 +81,8 @@ - + diff --git a/examples/bind-input.js b/examples/bind-input.js index cc1d338400..716c870d2a 100644 --- a/examples/bind-input.js +++ b/examples/bind-input.js @@ -1,6 +1,5 @@ goog.require('ol.BrowserFeature'); goog.require('ol.Map'); -goog.require('ol.RendererHints'); goog.require('ol.View2D'); goog.require('ol.dom.Input'); goog.require('ol.layer.Tile'); @@ -30,7 +29,7 @@ var view = new ol.View2D({ var map = new ol.Map({ layers: [layer], - renderer: ol.RendererHints.createFromQueryData(), + renderer: exampleNS.getRendererFromQueryString(), target: 'map', view: view }); diff --git a/examples/bing-maps.html b/examples/bing-maps.html index 160a5b2d7f..a55bf4bd0d 100644 --- a/examples/bing-maps.html +++ b/examples/bing-maps.html @@ -51,8 +51,8 @@ - + diff --git a/examples/bing-maps.js b/examples/bing-maps.js index 212016e14f..873b412709 100644 --- a/examples/bing-maps.js +++ b/examples/bing-maps.js @@ -1,5 +1,4 @@ goog.require('ol.Map'); -goog.require('ol.RendererHints'); goog.require('ol.View2D'); goog.require('ol.layer.Tile'); goog.require('ol.source.BingMaps'); @@ -26,7 +25,7 @@ for (i = 0, ii = styles.length; i < ii; ++i) { } var map = new ol.Map({ layers: layers, - renderer: ol.RendererHints.createFromQueryData(), + renderer: exampleNS.getRendererFromQueryString(), target: 'map', view: new ol.View2D({ center: [-6655.5402445057125, 6709968.258934638], diff --git a/examples/brightness-contrast.html b/examples/brightness-contrast.html index 63189a0acd..df6ceaf063 100644 --- a/examples/brightness-contrast.html +++ b/examples/brightness-contrast.html @@ -66,8 +66,8 @@ - + diff --git a/examples/canvas-tiles.html b/examples/canvas-tiles.html index 639d7d3ef6..e87f2c8ad0 100644 --- a/examples/canvas-tiles.html +++ b/examples/canvas-tiles.html @@ -44,8 +44,8 @@ - + diff --git a/examples/canvas-tiles.js b/examples/canvas-tiles.js index f2b8cc0e69..9d113f9be1 100644 --- a/examples/canvas-tiles.js +++ b/examples/canvas-tiles.js @@ -1,5 +1,4 @@ goog.require('ol.Map'); -goog.require('ol.RendererHints'); goog.require('ol.View2D'); goog.require('ol.layer.Tile'); goog.require('ol.proj'); @@ -22,7 +21,7 @@ var map = new ol.Map({ }) }) ], - renderer: ol.RendererHints.createFromQueryData(), + renderer: exampleNS.getRendererFromQueryString(), target: 'map', view: new ol.View2D({ center: ol.proj.transform( diff --git a/examples/custom-controls.html b/examples/custom-controls.html index d1133e6baf..46b170e745 100644 --- a/examples/custom-controls.html +++ b/examples/custom-controls.html @@ -82,8 +82,8 @@ - + diff --git a/examples/custom-controls.js b/examples/custom-controls.js index 8f1f756830..146860e4fc 100644 --- a/examples/custom-controls.js +++ b/examples/custom-controls.js @@ -1,6 +1,5 @@ goog.require('ol'); goog.require('ol.Map'); -goog.require('ol.RendererHints'); goog.require('ol.View2D'); goog.require('ol.control'); goog.require('ol.control.Control'); @@ -71,7 +70,7 @@ var map = new ol.Map({ source: new ol.source.OSM() }) ], - renderer: ol.RendererHints.createFromQueryData(), + renderer: exampleNS.getRendererFromQueryString(), target: 'map', view: new ol.View2D({ center: [0, 0], diff --git a/examples/d3.html b/examples/d3.html index 7d56ff152b..3e00f0b828 100644 --- a/examples/d3.html +++ b/examples/d3.html @@ -46,8 +46,8 @@ - + diff --git a/examples/device-orientation.html b/examples/device-orientation.html index 069e77687d..90004e444f 100644 --- a/examples/device-orientation.html +++ b/examples/device-orientation.html @@ -50,8 +50,8 @@ - + diff --git a/examples/device-orientation.js b/examples/device-orientation.js index fcf8e639d5..51901b6e8b 100644 --- a/examples/device-orientation.js +++ b/examples/device-orientation.js @@ -1,6 +1,5 @@ goog.require('ol.DeviceOrientation'); goog.require('ol.Map'); -goog.require('ol.RendererHints'); goog.require('ol.View2D'); goog.require('ol.dom.Input'); goog.require('ol.layer.Tile'); @@ -16,7 +15,7 @@ var map = new ol.Map({ source: new ol.source.OSM() }) ], - renderer: ol.RendererHints.createFromQueryData(), + renderer: exampleNS.getRendererFromQueryString(), target: 'map', view: view }); diff --git a/examples/drag-and-drop-image-vector.html b/examples/drag-and-drop-image-vector.html index e19c422047..ebd65e302d 100644 --- a/examples/drag-and-drop-image-vector.html +++ b/examples/drag-and-drop-image-vector.html @@ -48,8 +48,8 @@ - + diff --git a/examples/drag-and-drop-image-vector.js b/examples/drag-and-drop-image-vector.js index 7aa470eea9..c211379aba 100644 --- a/examples/drag-and-drop-image-vector.js +++ b/examples/drag-and-drop-image-vector.js @@ -1,5 +1,4 @@ goog.require('ol.Map'); -goog.require('ol.RendererHints'); goog.require('ol.View2D'); goog.require('ol.format.GPX'); goog.require('ol.format.GeoJSON'); @@ -105,7 +104,7 @@ var map = new ol.Map({ }) }) ], - renderer: ol.RendererHints.createFromQueryData(), + renderer: exampleNS.getRendererFromQueryString(), target: 'map', view: new ol.View2D({ center: [0, 0], diff --git a/examples/drag-and-drop.html b/examples/drag-and-drop.html index 96b881a317..965af91ee7 100644 --- a/examples/drag-and-drop.html +++ b/examples/drag-and-drop.html @@ -48,8 +48,8 @@ - + diff --git a/examples/drag-rotate-and-zoom.html b/examples/drag-rotate-and-zoom.html index 4dc8775023..dc4cfaf107 100644 --- a/examples/drag-rotate-and-zoom.html +++ b/examples/drag-rotate-and-zoom.html @@ -44,8 +44,8 @@ - + diff --git a/examples/drag-rotate-and-zoom.js b/examples/drag-rotate-and-zoom.js index 958a9999ac..51f98c974e 100644 --- a/examples/drag-rotate-and-zoom.js +++ b/examples/drag-rotate-and-zoom.js @@ -1,5 +1,4 @@ goog.require('ol.Map'); -goog.require('ol.RendererHints'); goog.require('ol.View2D'); goog.require('ol.interaction'); goog.require('ol.interaction.DragRotateAndZoom'); @@ -16,7 +15,7 @@ var map = new ol.Map({ source: new ol.source.MapQuest({layer: 'sat'}) }) ], - renderer: ol.RendererHints.createFromQueryData(), + renderer: exampleNS.getRendererFromQueryString(), target: 'map', view: new ol.View2D({ center: [0, 0], diff --git a/examples/draw-features.html b/examples/draw-features.html index 5b75037fe4..0df6aae29d 100644 --- a/examples/draw-features.html +++ b/examples/draw-features.html @@ -52,8 +52,8 @@ - + diff --git a/examples/dynamic-data.html b/examples/dynamic-data.html index 2f5edf1bbf..992be0daf6 100644 --- a/examples/dynamic-data.html +++ b/examples/dynamic-data.html @@ -43,8 +43,8 @@ - + diff --git a/examples/epsg-4326.html b/examples/epsg-4326.html index 96995c3b90..f3ae7f1f65 100644 --- a/examples/epsg-4326.html +++ b/examples/epsg-4326.html @@ -43,8 +43,8 @@ - + diff --git a/examples/export-map.html b/examples/export-map.html index a53cbbd384..5572181f4c 100644 --- a/examples/export-map.html +++ b/examples/export-map.html @@ -48,8 +48,8 @@ - + diff --git a/examples/full-screen-drag-rotate-and-zoom.html b/examples/full-screen-drag-rotate-and-zoom.html index ab47d82c0d..1c2567382a 100644 --- a/examples/full-screen-drag-rotate-and-zoom.html +++ b/examples/full-screen-drag-rotate-and-zoom.html @@ -56,8 +56,8 @@ - + diff --git a/examples/full-screen.html b/examples/full-screen.html index be4e885553..a0a7625b18 100644 --- a/examples/full-screen.html +++ b/examples/full-screen.html @@ -56,8 +56,8 @@ - + diff --git a/examples/full-screen.js b/examples/full-screen.js index 1ecb68f3f0..18a615b854 100644 --- a/examples/full-screen.js +++ b/examples/full-screen.js @@ -1,5 +1,4 @@ goog.require('ol.Map'); -goog.require('ol.RendererHints'); goog.require('ol.View2D'); goog.require('ol.control'); goog.require('ol.control.FullScreen'); @@ -24,7 +23,7 @@ var map = new ol.Map({ }) }) ], - renderer: ol.RendererHints.createFromQueryData(), + renderer: exampleNS.getRendererFromQueryString(), target: 'map', view: view }); diff --git a/examples/geojson.html b/examples/geojson.html index 24aaa51ce5..6822e40ff0 100644 --- a/examples/geojson.html +++ b/examples/geojson.html @@ -43,8 +43,8 @@ - + diff --git a/examples/geolocation.html b/examples/geolocation.html index ecc6cec32e..b3ffc85cbe 100644 --- a/examples/geolocation.html +++ b/examples/geolocation.html @@ -63,8 +63,8 @@ - + diff --git a/examples/geolocation.js b/examples/geolocation.js index c70626a4ff..8989dee7f7 100644 --- a/examples/geolocation.js +++ b/examples/geolocation.js @@ -5,7 +5,6 @@ goog.require('ol.Geolocation'); goog.require('ol.Map'); goog.require('ol.Overlay'); -goog.require('ol.RendererHints'); goog.require('ol.View2D'); goog.require('ol.dom.Input'); goog.require('ol.layer.Tile'); @@ -23,7 +22,7 @@ var map = new ol.Map({ source: new ol.source.OSM() }) ], - renderer: ol.RendererHints.createFromQueryData(), + renderer: exampleNS.getRendererFromQueryString(), target: 'map', view: view }); diff --git a/examples/getfeatureinfo.html b/examples/getfeatureinfo.html index 4d7bd3b6f7..930e96193c 100644 --- a/examples/getfeatureinfo.html +++ b/examples/getfeatureinfo.html @@ -49,8 +49,8 @@ - + diff --git a/examples/google-map.html b/examples/google-map.html index 82760fdfaa..742b1b4315 100644 --- a/examples/google-map.html +++ b/examples/google-map.html @@ -50,8 +50,8 @@ - + diff --git a/examples/gpx.html b/examples/gpx.html index 6e12988b2b..5598433633 100644 --- a/examples/gpx.html +++ b/examples/gpx.html @@ -48,8 +48,8 @@ - + diff --git a/examples/hue-saturation.html b/examples/hue-saturation.html index f9c7b79869..bcfd702c95 100644 --- a/examples/hue-saturation.html +++ b/examples/hue-saturation.html @@ -66,8 +66,8 @@ - + diff --git a/examples/icon.html b/examples/icon.html index 73a9a7fd2a..5cbc9ae9b0 100644 --- a/examples/icon.html +++ b/examples/icon.html @@ -54,8 +54,8 @@ - + diff --git a/examples/igc.html b/examples/igc.html index 63a784cbda..8fb12d19b8 100644 --- a/examples/igc.html +++ b/examples/igc.html @@ -48,8 +48,8 @@ - + diff --git a/examples/image-vector-layer.html b/examples/image-vector-layer.html index f43959baf6..86513c1422 100644 --- a/examples/image-vector-layer.html +++ b/examples/image-vector-layer.html @@ -51,8 +51,8 @@ - + diff --git a/examples/kml-earthquakes.html b/examples/kml-earthquakes.html index 73951c9226..f02c33bfc6 100644 --- a/examples/kml-earthquakes.html +++ b/examples/kml-earthquakes.html @@ -67,8 +67,8 @@ - + diff --git a/examples/kml-timezones.html b/examples/kml-timezones.html index 2fce5edfa8..aa3b2537e1 100644 --- a/examples/kml-timezones.html +++ b/examples/kml-timezones.html @@ -55,8 +55,8 @@ - + diff --git a/examples/kml.html b/examples/kml.html index 2e123a4236..0ee852dc8a 100644 --- a/examples/kml.html +++ b/examples/kml.html @@ -48,8 +48,8 @@ - + diff --git a/examples/layer-clipping-webgl.html b/examples/layer-clipping-webgl.html index 97a58d91a9..b6cc0b1f23 100644 --- a/examples/layer-clipping-webgl.html +++ b/examples/layer-clipping-webgl.html @@ -48,8 +48,8 @@ - + diff --git a/examples/layer-clipping.html b/examples/layer-clipping.html index 0db4de0d6c..80631eacda 100644 --- a/examples/layer-clipping.html +++ b/examples/layer-clipping.html @@ -43,8 +43,8 @@ - + diff --git a/examples/layer-group.html b/examples/layer-group.html index 52cea85ee4..99a4542ee5 100644 --- a/examples/layer-group.html +++ b/examples/layer-group.html @@ -118,8 +118,8 @@ - + diff --git a/examples/layer-group.js b/examples/layer-group.js index d475608807..1134b53831 100644 --- a/examples/layer-group.js +++ b/examples/layer-group.js @@ -1,5 +1,4 @@ goog.require('ol.Map'); -goog.require('ol.RendererHints'); goog.require('ol.View2D'); goog.require('ol.dom.Input'); goog.require('ol.layer.Group'); @@ -31,7 +30,7 @@ var map = new ol.Map({ ] }) ], - renderer: ol.RendererHints.createFromQueryData(), + renderer: exampleNS.getRendererFromQueryString(), target: 'map', view: new ol.View2D({ center: ol.proj.transform([37.40570, 8.81566], 'EPSG:4326', 'EPSG:3857'), diff --git a/examples/layer-spy.html b/examples/layer-spy.html index c6f2ca9245..f2655c9c5b 100644 --- a/examples/layer-spy.html +++ b/examples/layer-spy.html @@ -52,8 +52,8 @@ - + diff --git a/examples/layer-swipe.html b/examples/layer-swipe.html index a3f1281986..70054b2e05 100644 --- a/examples/layer-swipe.html +++ b/examples/layer-swipe.html @@ -44,8 +44,8 @@ - + diff --git a/examples/localized-openstreetmap.html b/examples/localized-openstreetmap.html index 5cb6ef7d23..b5b0f659ec 100644 --- a/examples/localized-openstreetmap.html +++ b/examples/localized-openstreetmap.html @@ -43,8 +43,8 @@ - + diff --git a/examples/mapguide-untiled.html b/examples/mapguide-untiled.html index ac111b1926..8103538bbc 100644 --- a/examples/mapguide-untiled.html +++ b/examples/mapguide-untiled.html @@ -43,8 +43,8 @@ - + diff --git a/examples/mapquest.html b/examples/mapquest.html index ece39868a7..78069a1a79 100644 --- a/examples/mapquest.html +++ b/examples/mapquest.html @@ -48,8 +48,8 @@ - + diff --git a/examples/mapquest.js b/examples/mapquest.js index 7f376241b8..2935d526d4 100644 --- a/examples/mapquest.js +++ b/examples/mapquest.js @@ -1,5 +1,4 @@ goog.require('ol.Map'); -goog.require('ol.RendererHints'); goog.require('ol.View2D'); goog.require('ol.layer.Group'); goog.require('ol.layer.Tile'); @@ -33,7 +32,7 @@ var layers = [ var map = new ol.Map({ layers: layers, - renderer: ol.RendererHints.createFromQueryData(), + renderer: exampleNS.getRendererFromQueryString(), target: 'map', view: new ol.View2D({ center: ol.proj.transform( diff --git a/examples/min-max-resolution.html b/examples/min-max-resolution.html index 59af04e66b..c99f592a60 100644 --- a/examples/min-max-resolution.html +++ b/examples/min-max-resolution.html @@ -52,8 +52,8 @@ - + diff --git a/examples/min-max-resolution.js b/examples/min-max-resolution.js index 2ecdf9649a..75805bf4d8 100644 --- a/examples/min-max-resolution.js +++ b/examples/min-max-resolution.js @@ -1,5 +1,4 @@ goog.require('ol.Map'); -goog.require('ol.RendererHints'); goog.require('ol.View2D'); goog.require('ol.layer.Tile'); goog.require('ol.source.OSM'); @@ -26,7 +25,7 @@ var map = new ol.Map({ maxResolution: 20000 }) ], - renderer: ol.RendererHints.createFromQueryData(), + renderer: exampleNS.getRendererFromQueryString(), target: 'map', view: new ol.View2D({ center: [653600, 5723680], diff --git a/examples/mobile-full-screen.html b/examples/mobile-full-screen.html index f478636a7a..bc146cd230 100644 --- a/examples/mobile-full-screen.html +++ b/examples/mobile-full-screen.html @@ -16,6 +16,8 @@
+ +
diff --git a/examples/mobile-full-screen.js b/examples/mobile-full-screen.js index 7d523bd225..15b218a46b 100644 --- a/examples/mobile-full-screen.js +++ b/examples/mobile-full-screen.js @@ -1,6 +1,5 @@ goog.require('ol.Geolocation'); goog.require('ol.Map'); -goog.require('ol.RendererHints'); goog.require('ol.View2D'); goog.require('ol.layer.Tile'); goog.require('ol.source.BingMaps'); @@ -20,7 +19,7 @@ var map = new ol.Map({ }) }) ], - renderer: ol.RendererHints.createFromQueryData(), + renderer: exampleNS.getRendererFromQueryString(), target: 'map', view: view }); diff --git a/examples/mouse-position.html b/examples/mouse-position.html index 990b88f828..57eedf9f08 100644 --- a/examples/mouse-position.html +++ b/examples/mouse-position.html @@ -51,8 +51,8 @@
- + diff --git a/examples/mouse-position.js b/examples/mouse-position.js index f7c37fd86a..1945a3ffb0 100644 --- a/examples/mouse-position.js +++ b/examples/mouse-position.js @@ -1,5 +1,4 @@ goog.require('ol.Map'); -goog.require('ol.RendererHints'); goog.require('ol.View2D'); goog.require('ol.control'); goog.require('ol.control.MousePosition'); @@ -26,7 +25,7 @@ var map = new ol.Map({ source: new ol.source.OSM() }) ], - renderer: ol.RendererHints.createFromQueryData(), + renderer: exampleNS.getRendererFromQueryString(), target: 'map', view: new ol.View2D({ center: [0, 0], diff --git a/examples/moveend.html b/examples/moveend.html index aa9484b59f..c7e172bffd 100644 --- a/examples/moveend.html +++ b/examples/moveend.html @@ -46,8 +46,8 @@ - + diff --git a/examples/moveend.js b/examples/moveend.js index f0b8c79082..a587e3c875 100644 --- a/examples/moveend.js +++ b/examples/moveend.js @@ -1,5 +1,4 @@ goog.require('ol.Map'); -goog.require('ol.RendererHints'); goog.require('ol.View2D'); goog.require('ol.extent'); goog.require('ol.layer.Tile'); @@ -13,7 +12,7 @@ var map = new ol.Map({ source: new ol.source.OSM() }) ], - renderer: ol.RendererHints.createFromQueryData(), + renderer: exampleNS.getRendererFromQueryString(), target: 'map', view: new ol.View2D({ center: [0, 0], diff --git a/examples/navigation-controls.html b/examples/navigation-controls.html index fbf1129649..3e9b6e83d2 100644 --- a/examples/navigation-controls.html +++ b/examples/navigation-controls.html @@ -48,8 +48,8 @@ - + diff --git a/examples/navigation-controls.js b/examples/navigation-controls.js index 1315c2fba4..4ecb21d522 100644 --- a/examples/navigation-controls.js +++ b/examples/navigation-controls.js @@ -1,5 +1,4 @@ goog.require('ol.Map'); -goog.require('ol.RendererHints'); goog.require('ol.View2D'); goog.require('ol.control'); goog.require('ol.control.ZoomToExtent'); @@ -21,7 +20,7 @@ var map = new ol.Map({ source: new ol.source.OSM() }) ], - renderer: ol.RendererHints.createFromQueryData(), + renderer: exampleNS.getRendererFromQueryString(), target: 'map', view: new ol.View2D({ center: [0, 0], diff --git a/examples/overlay.html b/examples/overlay.html index 0916f47ebb..ca6aed2dfb 100644 --- a/examples/overlay.html +++ b/examples/overlay.html @@ -77,8 +77,8 @@ - + diff --git a/examples/overlay.js b/examples/overlay.js index d6d9d0a3b2..ffe4b83ef6 100644 --- a/examples/overlay.js +++ b/examples/overlay.js @@ -1,6 +1,5 @@ goog.require('ol.Map'); goog.require('ol.Overlay'); -goog.require('ol.RendererHints'); goog.require('ol.View2D'); goog.require('ol.coordinate'); goog.require('ol.layer.Tile'); @@ -14,7 +13,7 @@ var layer = new ol.layer.Tile({ var map = new ol.Map({ layers: [layer], - renderer: ol.RendererHints.createFromQueryData(), + renderer: exampleNS.getRendererFromQueryString(), target: 'map', view: new ol.View2D({ center: [0, 0], diff --git a/examples/popup.html b/examples/popup.html index 97f1e9ac6c..b9905de2d4 100644 --- a/examples/popup.html +++ b/examples/popup.html @@ -98,8 +98,8 @@ - + diff --git a/examples/popup.js b/examples/popup.js index eda8f5245d..50675368c1 100644 --- a/examples/popup.js +++ b/examples/popup.js @@ -1,6 +1,5 @@ goog.require('ol.Map'); goog.require('ol.Overlay'); -goog.require('ol.RendererHints'); goog.require('ol.View2D'); goog.require('ol.coordinate'); goog.require('ol.layer.Tile'); @@ -48,7 +47,7 @@ var map = new ol.Map({ }) }) ], - renderer: ol.RendererHints.createFromQueryData(), + renderer: exampleNS.getRendererFromQueryString(), overlays: [overlay], target: 'map', view: new ol.View2D({ diff --git a/examples/preload.html b/examples/preload.html index 81e2f998ec..404e051448 100644 --- a/examples/preload.html +++ b/examples/preload.html @@ -47,8 +47,8 @@ - + diff --git a/examples/preload.js b/examples/preload.js index 8b61f22ab4..d9fae1c686 100644 --- a/examples/preload.js +++ b/examples/preload.js @@ -1,5 +1,4 @@ goog.require('ol.Map'); -goog.require('ol.RendererHints'); goog.require('ol.View2D'); goog.require('ol.layer.Tile'); goog.require('ol.source.BingMaps'); @@ -15,7 +14,7 @@ var map1 = new ol.Map({ }) }) ], - renderer: ol.RendererHints.createFromQueryData(), + renderer: exampleNS.getRendererFromQueryString(), target: 'map1', view: new ol.View2D({ center: [-4808600, -2620936], @@ -33,7 +32,7 @@ var map2 = new ol.Map({ }) }) ], - renderer: ol.RendererHints.createFromQueryData(), + renderer: exampleNS.getRendererFromQueryString(), target: 'map2' }); map2.bindTo('view', map1); diff --git a/examples/rotation.html b/examples/rotation.html index 14f62a60cf..aa3c8b6939 100644 --- a/examples/rotation.html +++ b/examples/rotation.html @@ -44,8 +44,8 @@ - + diff --git a/examples/rotation.js b/examples/rotation.js index b93dac0517..e1c87f7260 100644 --- a/examples/rotation.js +++ b/examples/rotation.js @@ -1,5 +1,4 @@ goog.require('ol.Map'); -goog.require('ol.RendererHints'); goog.require('ol.View2D'); goog.require('ol.layer.Tile'); goog.require('ol.source.OSM'); @@ -11,7 +10,7 @@ var map = new ol.Map({ source: new ol.source.OSM() }) ], - renderer: ol.RendererHints.createFromQueryData(), + renderer: exampleNS.getRendererFromQueryString(), target: 'map', view: new ol.View2D({ center: [-25860000, 4130000], diff --git a/examples/rtree.html b/examples/rtree.html index 89f1e99432..ddd884d7d4 100644 --- a/examples/rtree.html +++ b/examples/rtree.html @@ -43,8 +43,8 @@ - + diff --git a/examples/scale-line.html b/examples/scale-line.html index f284b30607..59088591d5 100644 --- a/examples/scale-line.html +++ b/examples/scale-line.html @@ -48,8 +48,8 @@ - + diff --git a/examples/scale-line.js b/examples/scale-line.js index d417b54a74..d39392f014 100644 --- a/examples/scale-line.js +++ b/examples/scale-line.js @@ -1,5 +1,4 @@ goog.require('ol.Map'); -goog.require('ol.RendererHints'); goog.require('ol.View2D'); goog.require('ol.control'); goog.require('ol.control.ScaleLine'); @@ -19,7 +18,7 @@ var map = new ol.Map({ source: new ol.source.OSM() }) ], - renderer: ol.RendererHints.createFromQueryData(), + renderer: exampleNS.getRendererFromQueryString(), target: 'map', view: new ol.View2D({ center: [0, 0], diff --git a/examples/select-features.html b/examples/select-features.html index a6e12c207f..3c6ba449b1 100644 --- a/examples/select-features.html +++ b/examples/select-features.html @@ -44,8 +44,8 @@ - + diff --git a/examples/semi-transparent-layer.html b/examples/semi-transparent-layer.html index 1a877e35ab..dea696a910 100644 --- a/examples/semi-transparent-layer.html +++ b/examples/semi-transparent-layer.html @@ -43,8 +43,8 @@ - + diff --git a/examples/semi-transparent-layer.js b/examples/semi-transparent-layer.js index ebb4d37bc5..b5b4ef5284 100644 --- a/examples/semi-transparent-layer.js +++ b/examples/semi-transparent-layer.js @@ -1,5 +1,4 @@ goog.require('ol.Map'); -goog.require('ol.RendererHints'); goog.require('ol.View2D'); goog.require('ol.layer.Tile'); goog.require('ol.proj'); @@ -19,7 +18,7 @@ var map = new ol.Map({ }) }) ], - renderer: ol.RendererHints.createFromQueryData(), + renderer: exampleNS.getRendererFromQueryString(), target: 'map', view: new ol.View2D({ center: ol.proj.transform([-77.93255, 37.9555], 'EPSG:4326', 'EPSG:3857'), diff --git a/examples/side-by-side.html b/examples/side-by-side.html index 7df539fc64..110bb52cfa 100644 --- a/examples/side-by-side.html +++ b/examples/side-by-side.html @@ -55,8 +55,8 @@ - + diff --git a/examples/simple.html b/examples/simple.html index 860ac484ee..d4094bcab2 100644 --- a/examples/simple.html +++ b/examples/simple.html @@ -43,8 +43,8 @@ - + diff --git a/examples/simple.js b/examples/simple.js index 07c698b12c..c3c620e350 100644 --- a/examples/simple.js +++ b/examples/simple.js @@ -1,5 +1,4 @@ goog.require('ol.Map'); -goog.require('ol.RendererHints'); goog.require('ol.View2D'); goog.require('ol.layer.Tile'); goog.require('ol.source.OSM'); @@ -11,7 +10,7 @@ var map = new ol.Map({ source: new ol.source.OSM() }) ], - renderer: ol.RendererHints.createFromQueryData(), + renderer: exampleNS.getRendererFromQueryString(), target: 'map', view: new ol.View2D({ center: [0, 0], diff --git a/examples/stamen.html b/examples/stamen.html index acf7cb1e8c..32d898b3e6 100644 --- a/examples/stamen.html +++ b/examples/stamen.html @@ -43,8 +43,8 @@ - + diff --git a/examples/stamen.js b/examples/stamen.js index f81d4474f9..917b455579 100644 --- a/examples/stamen.js +++ b/examples/stamen.js @@ -1,5 +1,4 @@ goog.require('ol.Map'); -goog.require('ol.RendererHints'); goog.require('ol.View2D'); goog.require('ol.layer.Tile'); goog.require('ol.proj'); @@ -19,7 +18,7 @@ var map = new ol.Map({ }) }) ], - renderer: ol.RendererHints.createFromQueryData(), + renderer: exampleNS.getRendererFromQueryString(), target: 'map', view: new ol.View2D({ center: ol.proj.transform( diff --git a/examples/static-image.html b/examples/static-image.html index 29c8d08290..b7ecc10d39 100644 --- a/examples/static-image.html +++ b/examples/static-image.html @@ -43,8 +43,8 @@ - + diff --git a/examples/synthetic-lines.html b/examples/synthetic-lines.html index 9065c02cfe..56f4ed371a 100644 --- a/examples/synthetic-lines.html +++ b/examples/synthetic-lines.html @@ -101,8 +101,8 @@ - + diff --git a/examples/synthetic-points.html b/examples/synthetic-points.html index 288ae98c5b..8641921d7d 100644 --- a/examples/synthetic-points.html +++ b/examples/synthetic-points.html @@ -44,8 +44,8 @@ - + diff --git a/examples/teleport.html b/examples/teleport.html index b67dda04b8..c6872207af 100644 --- a/examples/teleport.html +++ b/examples/teleport.html @@ -53,8 +53,8 @@ - + diff --git a/examples/teleport.js b/examples/teleport.js index b3268fa6f9..b6fff5a4a2 100644 --- a/examples/teleport.js +++ b/examples/teleport.js @@ -1,5 +1,4 @@ goog.require('ol.Map'); -goog.require('ol.RendererHints'); goog.require('ol.View2D'); goog.require('ol.layer.Tile'); goog.require('ol.source.OSM'); @@ -11,7 +10,7 @@ var map = new ol.Map({ source: new ol.source.OSM() }) ], - renderer: ol.RendererHints.createFromQueryData(), + renderer: exampleNS.getRendererFromQueryString(), view: new ol.View2D({ center: [0, 0], zoom: 2 diff --git a/examples/tilejson.html b/examples/tilejson.html index d534c699ce..ba84809a47 100644 --- a/examples/tilejson.html +++ b/examples/tilejson.html @@ -43,8 +43,8 @@ - + diff --git a/examples/tilejson.js b/examples/tilejson.js index 2865c6b537..7c5524718a 100644 --- a/examples/tilejson.js +++ b/examples/tilejson.js @@ -1,5 +1,4 @@ goog.require('ol.Map'); -goog.require('ol.RendererHints'); goog.require('ol.View2D'); goog.require('ol.layer.Tile'); goog.require('ol.source.TileJSON'); @@ -14,7 +13,7 @@ var map = new ol.Map({ }) }) ], - renderer: ol.RendererHints.createFromQueryData(), + renderer: exampleNS.getRendererFromQueryString(), target: 'map', view: new ol.View2D({ center: [0, 0], diff --git a/examples/topojson.html b/examples/topojson.html index e8bcd3e597..4fd4099299 100644 --- a/examples/topojson.html +++ b/examples/topojson.html @@ -45,8 +45,8 @@ - + diff --git a/examples/vector-layer.html b/examples/vector-layer.html index e015735d3a..c2d20f4fbf 100644 --- a/examples/vector-layer.html +++ b/examples/vector-layer.html @@ -48,8 +48,8 @@ - + diff --git a/examples/wms-capabilities.html b/examples/wms-capabilities.html index acc12dad11..11ffa869b3 100644 --- a/examples/wms-capabilities.html +++ b/examples/wms-capabilities.html @@ -41,8 +41,8 @@ - + diff --git a/examples/wms-custom-proj.html b/examples/wms-custom-proj.html index 6641ff0b51..f7fd18cdfd 100644 --- a/examples/wms-custom-proj.html +++ b/examples/wms-custom-proj.html @@ -45,8 +45,8 @@ - + diff --git a/examples/wms-custom-proj.js b/examples/wms-custom-proj.js index 62a3f00fee..a6687390bf 100644 --- a/examples/wms-custom-proj.js +++ b/examples/wms-custom-proj.js @@ -1,6 +1,5 @@ goog.require('ol.Attribution'); goog.require('ol.Map'); -goog.require('ol.RendererHints'); goog.require('ol.View2D'); goog.require('ol.control'); goog.require('ol.control.ScaleLine'); @@ -58,7 +57,7 @@ var map = new ol.Map({ }) ]), layers: layers, - renderer: ol.RendererHints.createFromQueryData(), + renderer: exampleNS.getRendererFromQueryString(), target: 'map', view: new ol.View2D({ projection: projection, diff --git a/examples/wms-image-custom-proj.html b/examples/wms-image-custom-proj.html index 8d32132257..ce714bfcb6 100644 --- a/examples/wms-image-custom-proj.html +++ b/examples/wms-image-custom-proj.html @@ -46,8 +46,8 @@ - + diff --git a/examples/wms-image-custom-proj.js b/examples/wms-image-custom-proj.js index 67a3a5aaa1..9f5758a792 100644 --- a/examples/wms-image-custom-proj.js +++ b/examples/wms-image-custom-proj.js @@ -1,6 +1,5 @@ goog.require('ol.Attribution'); goog.require('ol.Map'); -goog.require('ol.RendererHints'); goog.require('ol.View2D'); goog.require('ol.layer.Image'); goog.require('ol.proj'); @@ -51,7 +50,7 @@ var layers = [ var map = new ol.Map({ layers: layers, - renderer: ol.RendererHints.createFromQueryData(), + renderer: exampleNS.getRendererFromQueryString(), target: 'map', view: new ol.View2D({ projection: projection, diff --git a/examples/wms-image.html b/examples/wms-image.html index 7707eb5768..18b504fa22 100644 --- a/examples/wms-image.html +++ b/examples/wms-image.html @@ -43,8 +43,8 @@ - + diff --git a/examples/wms-no-proj.html b/examples/wms-no-proj.html index dc6e01b906..7d7fffef8b 100644 --- a/examples/wms-no-proj.html +++ b/examples/wms-no-proj.html @@ -43,8 +43,8 @@ - + diff --git a/examples/wms-no-proj.js b/examples/wms-no-proj.js index 6ec230650b..35096af958 100644 --- a/examples/wms-no-proj.js +++ b/examples/wms-no-proj.js @@ -1,6 +1,5 @@ goog.require('ol.Attribution'); goog.require('ol.Map'); -goog.require('ol.RendererHints'); goog.require('ol.View2D'); goog.require('ol.layer.Image'); goog.require('ol.layer.Tile'); @@ -52,7 +51,7 @@ var projection = new ol.proj.Projection({ var map = new ol.Map({ layers: layers, - renderer: ol.RendererHints.createFromQueryData(), + renderer: exampleNS.getRendererFromQueryString(), target: 'map', view: new ol.View2D({ center: [660000, 190000], diff --git a/examples/wms-tiled.html b/examples/wms-tiled.html index 1bc78e2527..ccaa34b915 100644 --- a/examples/wms-tiled.html +++ b/examples/wms-tiled.html @@ -43,8 +43,8 @@ - + diff --git a/examples/wmts.html b/examples/wmts.html index 1d03468dc1..8919494ebd 100644 --- a/examples/wmts.html +++ b/examples/wmts.html @@ -43,8 +43,8 @@ - + diff --git a/examples/xyz-esri.html b/examples/xyz-esri.html index 0e096fd533..f64a9ae171 100644 --- a/examples/xyz-esri.html +++ b/examples/xyz-esri.html @@ -43,8 +43,8 @@ - + diff --git a/examples/zoomify.html b/examples/zoomify.html index 11aed4215f..39b88628b2 100644 --- a/examples/zoomify.html +++ b/examples/zoomify.html @@ -43,8 +43,8 @@ - + diff --git a/examples/zoomify.js b/examples/zoomify.js index cd0136c531..c4f541a04e 100644 --- a/examples/zoomify.js +++ b/examples/zoomify.js @@ -1,5 +1,4 @@ goog.require('ol.Map'); -goog.require('ol.RendererHints'); goog.require('ol.View2D'); goog.require('ol.layer.Tile'); goog.require('ol.proj'); @@ -41,7 +40,7 @@ var map = new ol.Map({ source: source }) ], - renderer: ol.RendererHints.createFromQueryData(), + renderer: exampleNS.getRendererFromQueryString(), target: 'map', view: new ol.View2D({ projection: proj, diff --git a/examples/zoomslider.html b/examples/zoomslider.html index dd270449de..6d0c1fff4f 100644 --- a/examples/zoomslider.html +++ b/examples/zoomslider.html @@ -107,8 +107,8 @@ - + diff --git a/externs/example.js b/externs/example.js new file mode 100644 index 0000000000..01b9ac1a4c --- /dev/null +++ b/externs/example.js @@ -0,0 +1,9 @@ +/** + * @type {Object} + */ +var exampleNS; + + + +/** @interface */ +exampleNS.getRendererFromQueryString = function() {}; diff --git a/resources/example-behaviour.js b/resources/example-behaviour.js index eb0e264a15..7b85725392 100644 --- a/resources/example-behaviour.js +++ b/resources/example-behaviour.js @@ -17,6 +17,10 @@ modeTxt, modeChangedMethod; + if (!container) { + return; + } + modeChangedMethod = function() { var newMode = this.value, search = window.location.search.substring(1), @@ -56,9 +60,27 @@ $(select).change(modeChangedMethod); select.className = 'input-medium'; - + form.className = 'navbar-form pull-right'; form.appendChild(select); container.appendChild(form); })(); + +var exampleNS = {}; + +exampleNS.getRendererFromQueryString = function() { + var obj = {}, queryString = location.search.slice(1), + re = /([^&=]+)=([^&]*)/g, m; + + while (m = re.exec(queryString)) { + obj[decodeURIComponent(m[1])] = decodeURIComponent(m[2]); + } + if ('renderers' in obj) { + return obj['renderers'].split(','); + } else if ('renderer' in obj) { + return [obj['renderer']]; + } else { + return ['webgl', 'canvas', 'dom']; + } +}; diff --git a/src/ol/map.exports b/src/ol/map.exports index 6ffc569010..97bbc8abf7 100644 --- a/src/ol/map.exports +++ b/src/ol/map.exports @@ -21,6 +21,3 @@ @exportProperty ol.Map.prototype.render @exportProperty ol.Map.prototype.requestRenderFrame @exportProperty ol.Map.prototype.updateSize - -@exportSymbol ol.RendererHints -@exportProperty ol.RendererHints.createFromQueryData diff --git a/src/ol/map.js b/src/ol/map.js index 082e23b3c6..17f88cc720 100644 --- a/src/ol/map.js +++ b/src/ol/map.js @@ -5,7 +5,6 @@ goog.provide('ol.Map'); goog.provide('ol.MapProperty'); goog.provide('ol.RendererHint'); -goog.provide('ol.RendererHints'); goog.require('goog.Uri.QueryData'); goog.require('goog.array'); @@ -1471,24 +1470,6 @@ ol.Map.createOptionsInternal = function(options) { }; -/** - * @param {goog.Uri.QueryData=} opt_queryData Query data. - * @return {Array.} Renderer hints. - */ -ol.RendererHints.createFromQueryData = function(opt_queryData) { - var query = goog.global.location.search.substring(1), - queryData = goog.isDef(opt_queryData) ? - opt_queryData : new goog.Uri.QueryData(query); - if (queryData.containsKey('renderers')) { - return queryData.get('renderers').split(','); - } else if (queryData.containsKey('renderer')) { - return [queryData.get('renderer')]; - } else { - return ol.DEFAULT_RENDERER_HINTS; - } -}; - - ol.proj.common.add(); diff --git a/test/spec/ol/map.test.js b/test/spec/ol/map.test.js index 22d4160b43..e6bcd53ded 100644 --- a/test/spec/ol/map.test.js +++ b/test/spec/ol/map.test.js @@ -1,53 +1,4 @@ goog.provide('ol.test.Map'); -goog.provide('ol.test.RendererHints'); - -describe('ol.RendererHints', function() { - - describe('#createFromQueryData()', function() { - - var savedGoogGlobal; - - beforeEach(function() { - savedGoogGlobal = goog.global; - goog.global = {}; - }); - - afterEach(function() { - goog.global = savedGoogGlobal; - }); - - it('returns defaults when no query string', function() { - goog.global.location = {search: ''}; - var hints = ol.RendererHints.createFromQueryData(); - expect(hints).to.be(ol.DEFAULT_RENDERER_HINTS); - }); - - it('returns defaults when no "renderer" or "renderers"', function() { - goog.global.location = {search: '?foo=bar'}; - var hints = ol.RendererHints.createFromQueryData(); - expect(hints).to.be(ol.DEFAULT_RENDERER_HINTS); - }); - - it('returns array of one for "renderer"', function() { - goog.global.location = {search: '?renderer=bogus'}; - var hints = ol.RendererHints.createFromQueryData(); - expect(hints).to.eql(['bogus']); - }); - - it('accepts comma delimited list for "renderers"', function() { - goog.global.location = {search: '?renderers=one,two'}; - var hints = ol.RendererHints.createFromQueryData(); - expect(hints).to.eql(['one', 'two']); - }); - - it('works with "renderer" in second position', function() { - goog.global.location = {search: '?foo=bar&renderer=one'}; - var hints = ol.RendererHints.createFromQueryData(); - expect(hints).to.eql(['one']); - }); - - }); -}); describe('ol.Map', function() { @@ -242,8 +193,6 @@ goog.require('goog.dispose'); goog.require('goog.dom'); goog.require('ol.Map'); goog.require('ol.MapEvent'); -goog.require('ol.RendererHint'); -goog.require('ol.RendererHints'); goog.require('ol.View2D'); goog.require('ol.interaction'); goog.require('ol.interaction.Interaction');