ol3 is now internal, ol is now external

As discussed with @ahocevar, @elemoine and @tschaub.
This commit is contained in:
Tom Payne
2012-08-29 19:53:46 +02:00
parent 1eddf91996
commit 4aff22e980
116 changed files with 3953 additions and 3939 deletions

View File

@@ -1,39 +1,39 @@
goog.require('ol.Coordinate');
goog.require('ol.RendererHint');
goog.require('ol.control.Attribution');
goog.require('ol.createMap');
goog.require('ol.layer.BingMaps');
goog.require('ol.layer.TileJSON');
goog.require('ol3.Coordinate');
goog.require('ol3.RendererHint');
goog.require('ol3.control.Attribution');
goog.require('ol3.createMap');
goog.require('ol3.layer.BingMaps');
goog.require('ol3.layer.TileJSON');
var layer1 = new ol.layer.BingMaps(
ol.BingMapsStyle.AERIAL,
var layer1 = new ol3.layer.BingMaps(
ol3.BingMapsStyle.AERIAL,
'AheP841R-MsLErKQChaTba_xDoOCl40-EeTubD9uNhNAyQTePwFY9iVD1_pyqqlE');
var layer2 = new ol.layer.TileJSON(
var layer2 = new ol3.layer.TileJSON(
'http://api.tiles.mapbox.com/v3/mapbox.va-quake-aug.jsonp');
var layers = new ol.Collection([layer1, layer2]);
var layers = new ol3.Collection([layer1, layer2]);
var webglMap = ol.createMap(
var webglMap = ol3.createMap(
document.getElementById('webglMap'),
{'layers': new ol.Collection([layer1, layer2])},
ol.RendererHint.WEBGL);
{'layers': new ol3.Collection([layer1, layer2])},
ol3.RendererHint.WEBGL);
goog.events.listen(layer2, goog.events.EventType.LOAD, function() {
webglMap.setUserCenter(new ol.Coordinate(-77.93254999999999, 37.9555));
webglMap.setUserCenter(new ol3.Coordinate(-77.93254999999999, 37.9555));
webglMap.setResolution(layer2.getStore().getResolutions()[5]);
});
var domMap = ol.createMap(
var domMap = ol3.createMap(
document.getElementById('domMap'),
{},
ol.RendererHint.DOM);
ol3.RendererHint.DOM);
domMap.bindTo('center', webglMap);
domMap.bindTo('layers', webglMap);
domMap.bindTo('resolution', webglMap);
domMap.bindTo('rotation', webglMap);
var attributionControl = new ol.control.Attribution(webglMap);
var attributionControl = new ol3.control.Attribution(webglMap);
document.getElementById('attribution').appendChild(
attributionControl.getElement());