Remove getRendererFromQueryString from examples

This commit is contained in:
Peter Robins
2016-09-16 09:13:35 +00:00
parent 49e2e55063
commit 7d5635092a
52 changed files with 3 additions and 73 deletions

View File

@@ -11,7 +11,6 @@ var map = new ol.Map({
source: new ol.source.OSM() source: new ol.source.OSM()
}) })
], ],
renderer: common.getRendererFromQueryString(),
target: 'map', target: 'map',
controls: ol.control.defaults({ controls: ol.control.defaults({
attributionOptions: /** @type {olx.control.AttributionOptions} */ ({ attributionOptions: /** @type {olx.control.AttributionOptions} */ ({

View File

@@ -54,7 +54,6 @@ var map = new ol.Map({
source: new ol.source.OSM() source: new ol.source.OSM()
}) })
], ],
renderer: common.getRendererFromQueryString(),
// Improve user experience by loading tiles while animating. Will make // Improve user experience by loading tiles while animating. Will make
// animations stutter on mobile or slow devices. // animations stutter on mobile or slow devices.
loadTilesWhileAnimating: true, loadTilesWhileAnimating: true,

View File

@@ -15,7 +15,6 @@ var map = new ol.Map({
}) })
], ],
controls: ol.control.defaults({attribution: false}).extend([attribution]), controls: ol.control.defaults({attribution: false}).extend([attribution]),
renderer: common.getRendererFromQueryString(),
target: 'map', target: 'map',
view: new ol.View({ view: new ol.View({
center: [0, 0], center: [0, 0],

View File

@@ -28,7 +28,6 @@ for (i = 0, ii = styles.length; i < ii; ++i) {
} }
var map = new ol.Map({ var map = new ol.Map({
layers: layers, layers: layers,
renderer: common.getRendererFromQueryString(),
// Improve user experience by loading tiles while dragging/zooming. Will make // Improve user experience by loading tiles while dragging/zooming. Will make
// zooming choppy on mobile or slow devices. // zooming choppy on mobile or slow devices.
loadTilesWhileInteracting: true, loadTilesWhileInteracting: true,

View File

@@ -9,7 +9,6 @@ var map = new ol.Map({
source: new ol.source.OSM() source: new ol.source.OSM()
}) })
], ],
renderer: common.getRendererFromQueryString(),
target: 'map', target: 'map',
view: new ol.View({ view: new ol.View({
center: [-8730000, 5930000], center: [-8730000, 5930000],

View File

@@ -20,7 +20,6 @@ var map = new ol.Map({
}) })
}) })
], ],
renderer: common.getRendererFromQueryString(),
target: 'map', target: 'map',
controls: ol.control.defaults({ controls: ol.control.defaults({
attributionOptions: /** @type {olx.control.AttributionOptions} */ ({ attributionOptions: /** @type {olx.control.AttributionOptions} */ ({

View File

@@ -70,7 +70,6 @@ var map = new ol.Map({
source: new ol.source.OSM() source: new ol.source.OSM()
}) })
], ],
renderer: common.getRendererFromQueryString(),
target: 'map', target: 'map',
view: new ol.View({ view: new ol.View({
center: [0, 0], center: [0, 0],

View File

@@ -19,7 +19,6 @@ var map = new ol.Map({
source: new ol.source.OSM() source: new ol.source.OSM()
}) })
], ],
renderer: common.getRendererFromQueryString(),
target: 'map', target: 'map',
controls: ol.control.defaults({ controls: ol.control.defaults({
attributionOptions: /** @type {olx.control.AttributionOptions} */ ({ attributionOptions: /** @type {olx.control.AttributionOptions} */ ({

View File

@@ -104,7 +104,6 @@ var map = new ol.Map({
}) })
}) })
], ],
renderer: common.getRendererFromQueryString(),
target: 'map', target: 'map',
view: new ol.View({ view: new ol.View({
center: [0, 0], center: [0, 0],

View File

@@ -15,7 +15,6 @@ var map = new ol.Map({
source: new ol.source.OSM() source: new ol.source.OSM()
}) })
], ],
renderer: common.getRendererFromQueryString(),
target: 'map', target: 'map',
view: new ol.View({ view: new ol.View({
center: [0, 0], center: [0, 0],

View File

@@ -38,7 +38,6 @@ var vector = new ol.layer.Vector({
var map = new ol.Map({ var map = new ol.Map({
layers: [raster, vector], layers: [raster, vector],
renderer: common.getRendererFromQueryString(),
target: 'map', target: 'map',
view: new ol.View({ view: new ol.View({
center: [-11000000, 4600000], center: [-11000000, 4600000],

View File

@@ -16,7 +16,6 @@ var map = new ol.Map({
source: new ol.source.OSM() source: new ol.source.OSM()
}) })
], ],
renderer: common.getRendererFromQueryString(),
target: 'map', target: 'map',
view: new ol.View({ view: new ol.View({
center: [0, 0], center: [0, 0],

View File

@@ -28,7 +28,6 @@ var map = new ol.Map({
collapsible: false collapsible: false
}) })
}), }),
renderer: common.getRendererFromQueryString(),
target: 'map', target: 'map',
view: new ol.View({ view: new ol.View({
center: [0, 0], center: [0, 0],

View File

@@ -22,7 +22,6 @@ var map = new ol.Map({
source: new ol.source.OSM() source: new ol.source.OSM()
}) })
], ],
renderer: common.getRendererFromQueryString(),
target: 'map', target: 'map',
view: view view: view
}); });

View File

@@ -23,7 +23,6 @@ var map = new ol.Map({
}) })
}) })
], ],
renderer: common.getRendererFromQueryString(),
target: 'map', target: 'map',
view: view view: view
}); });

View File

@@ -21,7 +21,6 @@ var view = new ol.View({
}); });
var map = new ol.Map({ var map = new ol.Map({
renderer: common.getRendererFromQueryString(),
layers: [wmsLayer], layers: [wmsLayer],
target: 'map', target: 'map',
view: view view: view

View File

@@ -21,7 +21,6 @@ var view = new ol.View({
}); });
var map = new ol.Map({ var map = new ol.Map({
renderer: common.getRendererFromQueryString(),
layers: [wmsLayer], layers: [wmsLayer],
target: 'map', target: 'map',
view: view view: view

View File

@@ -69,7 +69,6 @@ for (i = 0, ii = hereLayers.length; i < ii; ++i) {
var map = new ol.Map({ var map = new ol.Map({
layers: layers, layers: layers,
renderer: common.getRendererFromQueryString(),
// Improve user experience by loading tiles while dragging/zooming. Will make // Improve user experience by loading tiles while dragging/zooming. Will make
// zooming choppy on mobile or slow devices. // zooming choppy on mobile or slow devices.
loadTilesWhileInteracting: true, loadTilesWhileInteracting: true,

View File

@@ -61,7 +61,6 @@ var rasterLayer = new ol.layer.Tile({
}); });
var map = new ol.Map({ var map = new ol.Map({
renderer: common.getRendererFromQueryString(),
layers: [rasterLayer, vectorLayer], layers: [rasterLayer, vectorLayer],
target: document.getElementById('map'), target: document.getElementById('map'),
view: new ol.View({ view: new ol.View({

View File

@@ -79,7 +79,7 @@ var vector = new ol.layer.Vector({
}); });
var map = new ol.Map({ var map = new ol.Map({
renderer: common.getRendererFromQueryString('webgl'), renderer: 'webgl',
layers: [vector], layers: [vector],
target: document.getElementById('map'), target: document.getElementById('map'),
view: new ol.View({ view: new ol.View({

View File

@@ -45,7 +45,6 @@ var rasterLayer = new ol.layer.Tile({
}); });
var map = new ol.Map({ var map = new ol.Map({
renderer: common.getRendererFromQueryString(),
layers: [rasterLayer, vectorLayer], layers: [rasterLayer, vectorLayer],
target: document.getElementById('map'), target: document.getElementById('map'),
view: new ol.View({ view: new ol.View({

View File

@@ -99,7 +99,6 @@ var map = new ol.Map({
layers: [ layers: [
new ol.layer.Image({source: source}) new ol.layer.Image({source: source})
], ],
renderer: common.getRendererFromQueryString(),
target: 'map', target: 'map',
view: new ol.View({ view: new ol.View({
center: [-10997148, 4569099], center: [-10997148, 4569099],

View File

@@ -32,7 +32,6 @@ var overlay = new ol.layer.Tile({
var map = new ol.Map({ var map = new ol.Map({
layers: [base, overlay], layers: [base, overlay],
renderer: common.getRendererFromQueryString(),
target: 'map', target: 'map',
view: new ol.View({ view: new ol.View({
center: [0, 0], center: [0, 0],

View File

@@ -27,7 +27,6 @@ var map = new ol.Map({
] ]
}) })
], ],
renderer: common.getRendererFromQueryString(),
target: 'map', target: 'map',
view: new ol.View({ view: new ol.View({
center: ol.proj.fromLonLat([37.40570, 8.81566]), center: ol.proj.fromLonLat([37.40570, 8.81566]),

View File

@@ -9,7 +9,6 @@ var layer = new ol.layer.Tile();
var map = new ol.Map({ var map = new ol.Map({
layers: [layer], layers: [layer],
renderer: common.getRendererFromQueryString(),
target: 'map', target: 'map',
view: new ol.View({ view: new ol.View({
center: [0, 0], center: [0, 0],

View File

@@ -53,7 +53,6 @@ var vector = new ol.layer.Vector({
var map = new ol.Map({ var map = new ol.Map({
layers: [raster, vector], layers: [raster, vector],
renderer: common.getRendererFromQueryString(),
target: 'map', target: 'map',
view: new ol.View({ view: new ol.View({
center: [-11000000, 4600000], center: [-11000000, 4600000],

View File

@@ -25,7 +25,6 @@ var map = new ol.Map({
maxResolution: 20000 maxResolution: 20000
}) })
], ],
renderer: common.getRendererFromQueryString(),
target: 'map', target: 'map',
controls: ol.control.defaults({ controls: ol.control.defaults({
attributionOptions: /** @type {olx.control.AttributionOptions} */ ({ attributionOptions: /** @type {olx.control.AttributionOptions} */ ({

View File

@@ -19,7 +19,6 @@ var map = new ol.Map({
}) })
}) })
], ],
renderer: common.getRendererFromQueryString(),
target: 'map', target: 'map',
view: view view: view
}); });

View File

@@ -28,7 +28,6 @@ var map = new ol.Map({
source: new ol.source.OSM() source: new ol.source.OSM()
}) })
], ],
renderer: common.getRendererFromQueryString(),
target: 'map', target: 'map',
view: new ol.View({ view: new ol.View({
center: [0, 0], center: [0, 0],

View File

@@ -13,7 +13,6 @@ var map = new ol.Map({
source: new ol.source.OSM() source: new ol.source.OSM()
}) })
], ],
renderer: common.getRendererFromQueryString(),
target: 'map', target: 'map',
controls: ol.control.defaults({ controls: ol.control.defaults({
attributionOptions: /** @type {olx.control.AttributionOptions} */ ({ attributionOptions: /** @type {olx.control.AttributionOptions} */ ({

View File

@@ -24,7 +24,6 @@ var map = new ol.Map({
source: new ol.source.OSM() source: new ol.source.OSM()
}) })
], ],
renderer: common.getRendererFromQueryString(),
target: 'map', target: 'map',
view: new ol.View({ view: new ol.View({
center: [0, 0], center: [0, 0],

View File

@@ -13,7 +13,6 @@ var layer = new ol.layer.Tile({
var map = new ol.Map({ var map = new ol.Map({
layers: [layer], layers: [layer],
renderer: common.getRendererFromQueryString(),
target: 'map', target: 'map',
view: new ol.View({ view: new ol.View({
center: [0, 0], center: [0, 0],

View File

@@ -50,7 +50,6 @@ var map = new ol.Map({
}) })
}) })
], ],
renderer: common.getRendererFromQueryString(),
overlays: [overlay], overlays: [overlay],
target: 'map', target: 'map',
view: new ol.View({ view: new ol.View({

View File

@@ -19,7 +19,6 @@ var map1 = new ol.Map({
}) })
}) })
], ],
renderer: common.getRendererFromQueryString(),
target: 'map1', target: 'map1',
view: view view: view
}); });
@@ -34,7 +33,6 @@ var map2 = new ol.Map({
}) })
}) })
], ],
renderer: common.getRendererFromQueryString(),
target: 'map2', target: 'map2',
view: view view: view
}); });

View File

@@ -13,7 +13,6 @@ var map = new ol.Map({
source: new ol.source.OSM() source: new ol.source.OSM()
}) })
], ],
renderer: common.getRendererFromQueryString(),
target: 'map', target: 'map',
view: new ol.View({ view: new ol.View({
projection: 'EPSG:3857', projection: 'EPSG:3857',

View File

@@ -29,7 +29,6 @@ var map = new ol.Map({
}) })
}) })
], ],
renderer: common.getRendererFromQueryString(),
target: 'map', target: 'map',
view: new ol.View({ view: new ol.View({
center: ol.proj.transform( center: ol.proj.transform(

View File

@@ -9,7 +9,6 @@ var map = new ol.Map({
source: new ol.source.OSM() source: new ol.source.OSM()
}) })
], ],
renderer: common.getRendererFromQueryString(),
target: 'map', target: 'map',
view: new ol.View({ view: new ol.View({
projection: 'EPSG:4326', projection: 'EPSG:4326',

View File

@@ -148,7 +148,6 @@ var map = new ol.Map({
layers['osm'], layers['osm'],
layers['bng'] layers['bng']
], ],
renderer: common.getRendererFromQueryString(),
target: 'map', target: 'map',
view: new ol.View({ view: new ol.View({
projection: 'EPSG:3857', projection: 'EPSG:3857',

View File

@@ -79,24 +79,3 @@
container.appendChild(form); container.appendChild(form);
})(); })();
var common = {};
common.getRendererFromQueryString = function(opt_default) {
var obj = {};
var queryString = location.search.slice(1);
var re = /([^&=]+)=([^&]*)/g;
var m = re.exec(queryString);
while (m) {
obj[decodeURIComponent(m[1])] = decodeURIComponent(m[2]);
m = re.exec(queryString);
}
if ('renderers' in obj) {
return obj['renderers'].split(',');
} else if ('renderer' in obj) {
return [obj['renderer']];
} else {
return opt_default;
}
};

View File

@@ -11,7 +11,6 @@ var map = new ol.Map({
source: new ol.source.OSM() source: new ol.source.OSM()
}) })
], ],
renderer: common.getRendererFromQueryString(),
target: 'map', target: 'map',
controls: ol.control.defaults({ controls: ol.control.defaults({
attributionOptions: /** @type {olx.control.AttributionOptions} */ ({ attributionOptions: /** @type {olx.control.AttributionOptions} */ ({

View File

@@ -21,7 +21,6 @@ var map = new ol.Map({
source: new ol.source.OSM() source: new ol.source.OSM()
}) })
], ],
renderer: common.getRendererFromQueryString(),
target: 'map', target: 'map',
view: new ol.View({ view: new ol.View({
center: [0, 0], center: [0, 0],

View File

@@ -18,7 +18,6 @@ var map = new ol.Map({
}) })
}) })
], ],
renderer: common.getRendererFromQueryString(),
target: 'map', target: 'map',
view: new ol.View({ view: new ol.View({
center: ol.proj.fromLonLat([-77.93255, 37.9555]), center: ol.proj.fromLonLat([-77.93255, 37.9555]),

View File

@@ -18,7 +18,6 @@ var map = new ol.Map({
}) })
}) })
], ],
renderer: common.getRendererFromQueryString(),
target: 'map', target: 'map',
view: new ol.View({ view: new ol.View({
center: ol.proj.transform( center: ol.proj.transform(

View File

@@ -107,7 +107,7 @@ var vector = new ol.layer.Vector({
}); });
var map = new ol.Map({ var map = new ol.Map({
renderer: common.getRendererFromQueryString('webgl'), renderer: 'webgl',
layers: [vector], layers: [vector],
target: document.getElementById('map'), target: document.getElementById('map'),
view: new ol.View({ view: new ol.View({

View File

@@ -11,7 +11,6 @@ var map = new ol.Map({
source: new ol.source.OSM() source: new ol.source.OSM()
}) })
], ],
renderer: common.getRendererFromQueryString(),
controls: ol.control.defaults({ controls: ol.control.defaults({
attributionOptions: /** @type {olx.control.AttributionOptions} */ ({ attributionOptions: /** @type {olx.control.AttributionOptions} */ ({
collapsible: false collapsible: false

View File

@@ -98,7 +98,6 @@ var map = new ol.Map({
layers: [ layers: [
new ol.layer.Tile({source: source}) new ol.layer.Tile({source: source})
], ],
renderer: common.getRendererFromQueryString(),
target: 'map', target: 'map',
view: new ol.View({ view: new ol.View({
center: [0, 0], center: [0, 0],

View File

@@ -13,7 +13,6 @@ var map = new ol.Map({
}) })
}) })
], ],
renderer: common.getRendererFromQueryString(),
target: 'map', target: 'map',
view: new ol.View({ view: new ol.View({
center: [0, 0], center: [0, 0],

View File

@@ -76,7 +76,6 @@ var map = new ol.Map({
}) })
]), ]),
layers: layers, layers: layers,
renderer: common.getRendererFromQueryString(),
target: 'map', target: 'map',
view: new ol.View({ view: new ol.View({
projection: projection, projection: projection,

View File

@@ -62,7 +62,6 @@ var map = new ol.Map({
new ol.control.ScaleLine() new ol.control.ScaleLine()
]), ]),
layers: layers, layers: layers,
renderer: common.getRendererFromQueryString(),
target: 'map', target: 'map',
view: new ol.View({ view: new ol.View({
projection: projection, projection: projection,

View File

@@ -22,7 +22,6 @@ var layers = [
var map = new ol.Map({ var map = new ol.Map({
layers: layers, layers: layers,
target: 'map', target: 'map',
renderer: common.getRendererFromQueryString(),
view: new ol.View({ view: new ol.View({
center: [-10997148, 4569099], center: [-10997148, 4569099],
zoom: 4 zoom: 4

View File

@@ -44,7 +44,6 @@ var projection = new ol.proj.Projection({
var map = new ol.Map({ var map = new ol.Map({
layers: layers, layers: layers,
renderer: common.getRendererFromQueryString(),
target: 'map', target: 'map',
view: new ol.View({ view: new ol.View({
center: [660000, 190000], center: [660000, 190000],

View File

@@ -7,7 +7,7 @@ var marked = require('marked');
var pkg = require('../package.json'); var pkg = require('../package.json');
var markupRegEx = /([^\/^\.]*)\.html$/; var markupRegEx = /([^\/^\.]*)\.html$/;
var cleanupJSRegEx = /.*(\/\/ NOCOMPILE|goog\.require\(.*\);|.*renderer: common\..*,?)[\n]*/g; var cleanupJSRegEx = /.*(\/\/ NOCOMPILE|goog\.require\(.*\);)[\n]*/g;
var requiresRegEx = /.*goog\.require\('(ol\.\S*)'\);/g; var requiresRegEx = /.*goog\.require\('(ol\.\S*)'\);/g;
var isCssRegEx = /\.css$/; var isCssRegEx = /\.css$/;
var isJsRegEx = /\.js$/; var isJsRegEx = /\.js$/;