The common.js script makes a "common" object available

This commit is contained in:
Tim Schaub
2015-04-17 09:49:53 -06:00
parent eff14b06e0
commit c5cf709c55
50 changed files with 55 additions and 55 deletions

View File

@@ -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

View File

@@ -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} */ ({

View File

@@ -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,

View File

@@ -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],

View File

@@ -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,

View File

@@ -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],

View File

@@ -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} */ ({

View File

@@ -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],

View File

@@ -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} */ ({

View File

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

View File

@@ -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],

View File

@@ -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],

View File

@@ -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],

View File

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

View File

@@ -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

View File

@@ -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

View File

@@ -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;
}

View File

@@ -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';
}

View File

@@ -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({

View File

@@ -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],

View File

@@ -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;
}

View File

@@ -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],

View File

@@ -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]),

View File

@@ -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],

View File

@@ -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],

View File

@@ -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(

View File

@@ -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} */ ({

View File

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

View File

@@ -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],

View File

@@ -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} */ ({

View File

@@ -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],

View File

@@ -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],

View File

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

View File

@@ -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
});

View File

@@ -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));
};

View File

@@ -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} */ ({

View File

@@ -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],

View File

@@ -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]),

View File

@@ -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],

View File

@@ -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(

View File

@@ -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';
}

View File

@@ -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

View File

@@ -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],

View File

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

View File

@@ -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,

View File

@@ -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,

View File

@@ -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],

View File

@@ -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,

View File

@@ -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) {};

View File

@@ -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$/;