ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Éric Lemoine
2012-09-27 17:57:44 +02:00
parent d99a0c164e 0faab71e3f
commit 676a95efd8
9 changed files with 242 additions and 282 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
demos/full-screen/full-screen.js
View File

@@ -23,4 +23,7 @@ var map = new ol.Map(document.getElementById('map'), {
layers: new ol.Collection([layer]),
zoom: 2
});
var zoom = new ol.control.Zoom(map, 4);
var zoom = new ol.control.Zoom({
delta: 4,
map: map
});

31
demos/side-by-side/side-by-side.js
View File

@@ -38,21 +38,26 @@ if (!goog.isNull(webglMap)) {
webglMap.bindTo('rotation', domMap);
}
var attributionControl = new ol.control.Attribution(domMap);
document.getElementById('attribution').appendChild(
attributionControl.getElement());
var attributionControl = new ol.control.Attribution({
map: domMap,
target: document.getElementById('attribution')
});
var domMousePositionControl = new ol.control.MousePosition(domMap,
ol.Projection.getFromCode('EPSG:4326'), ol.CoordinateFormat.hdms,
' ');
document.getElementById('domMousePosition').appendChild(
domMousePositionControl.getElement());
var domMousePositionControl = new ol.control.MousePosition({
coordinateFormat: ol.CoordinateFormat.hdms,
map: domMap,
projection: ol.Projection.getFromCode('EPSG:4326'),
target: document.getElementById('domMousePosition'),
undefinedHtml: ' '
});
var webglMousePositionControl = new ol.control.MousePosition(webglMap,
ol.Projection.getFromCode('EPSG:4326'), ol.CoordinateFormat.hdms,
' ');
document.getElementById('webglMousePosition').appendChild(
webglMousePositionControl.getElement());
var webglMousePositionControl = new ol.control.MousePosition({
coordinateFormat: ol.CoordinateFormat.hdms,
map: webglMap,
projection: ol.Projection.getFromCode('EPSG:4326'),
target: document.getElementById('webglMousePosition'),
undefinedHtml: ' '
});
var keyboardInteraction = new ol.interaction.Keyboard();
keyboardInteraction.addCallback('0', function() {

9
demos/two-layers/two-layers.js
View File

@@ -12,7 +12,7 @@ goog.require('ol.source.TileJSON');
var layers = new ol.Collection([
new ol.layer.TileLayer({
source: new ol.source.BingMaps({
key: 'AheP841R-MsLErKQChaTba_xDoOCl40-EeTubD9uNhNAyQTePwFY9iVD1_pyqqlE',
key: 'Ak0kFwyFsvMr0dVwuaURTqKAXytSSN47KOdj4uVpaWBhK-DT6Zo-FeHCiJUL0tYL',
style: ol.BingMapsStyle.AERIAL
})
}),
@@ -39,6 +39,7 @@ domMap.bindTo('layers', webglMap);
domMap.bindTo('resolution', webglMap);
domMap.bindTo('rotation', webglMap);
var attributionControl = new ol.control.Attribution(webglMap);
document.getElementById('attribution').appendChild(
attributionControl.getElement());
var attributionControl = new ol.control.Attribution({
map: webglMap,
target: document.getElementById('attribution')
});

87
src/ol/control/attribution.js
View File

@@ -4,6 +4,7 @@
// FIXME check clean-up code
goog.provide('ol.control.Attribution');
goog.provide('ol.control.AttributionOptions');
goog.require('goog.dom');
goog.require('goog.dom.TagName');
@@ -19,21 +20,25 @@ goog.require('ol.control.Control');
goog.require('ol.layer.Layer');
/**
* @typedef {{map: (ol.Map|undefined),
* target: (Element|undefined)}}
*/
ol.control.AttributionOptions;
/**
* @constructor
* @extends {ol.control.Control}
* @param {ol.Map} map Map.
* @param {ol.control.AttributionOptions} attributionOptions Attribution
* options.
*/
ol.control.Attribution = function(map) {
ol.control.Attribution = function(attributionOptions) {
goog.base(this, map);
/**
* @private
* @type {Element}
*/
this.ulElement_ = goog.dom.createElement(goog.dom.TagName.UL);
var element = goog.dom.createDom(goog.dom.TagName.UL, {
'class': 'ol-attribution'
});
/**
* @private
@@ -59,22 +64,17 @@ ol.control.Attribution = function(map) {
*/
this.coverageAreass_ = {};
goog.events.listen(
map, ol.Object.getChangedEventType(ol.MapProperty.CENTER),
this.handleMapChanged, false, this);
/**
* @private
* @type {Array.<number>}
*/
this.mapListenerKeys_ = null;
goog.events.listen(
map, ol.Object.getChangedEventType(ol.MapProperty.LAYERS),
this.handleMapLayersChanged, false, this);
goog.events.listen(map,
ol.Object.getChangedEventType(ol.MapProperty.RESOLUTION),
this.handleMapChanged, false, this);
goog.events.listen(map, ol.Object.getChangedEventType(ol.MapProperty.SIZE),
this.handleMapChanged, false, this);
this.handleMapLayersChanged();
goog.base(this, {
element: element,
map: attributionOptions.map,
target: attributionOptions.target
});
};
goog.inherits(ol.control.Attribution, ol.control.Control);
@@ -145,7 +145,7 @@ ol.control.Attribution.prototype.createAttributionElementsForLayer_ =
goog.style.showElement(attributionElement, false);
}
goog.dom.appendChild(this.ulElement_, attributionElement);
goog.dom.appendChild(this.element, attributionElement);
this.attributionElements_[attributionKey] = attributionElement;
@@ -154,14 +154,6 @@ ol.control.Attribution.prototype.createAttributionElementsForLayer_ =
};
/**
* @inheritDoc
*/
ol.control.Attribution.prototype.getElement = function() {
return this.ulElement_;
};
/**
* @param {ol.layer.Layer} layer Layer.
* @param {ol.Extent} mapExtent Map extent.
@@ -361,6 +353,35 @@ ol.control.Attribution.prototype.removeLayer = function(layer) {
};
/**
* @inheritDoc
*/
ol.control.Attribution.prototype.setMap = function(map) {
if (!goog.isNull(this.mapListenerKeys_)) {
goog.array.forEach(this.mapListenerKeys_, goog.events.unlistenByKey);
}
this.mapListenerKeys_ = null;
goog.base(this, 'setMap', map);
if (!goog.isNull(map)) {
this.mapListenerKeys_ = [
goog.events.listen(
map, ol.Object.getChangedEventType(ol.MapProperty.CENTER),
this.handleMapChanged, false, this),
goog.events.listen(
map, ol.Object.getChangedEventType(ol.MapProperty.LAYERS),
this.handleMapLayersChanged, false, this),
goog.events.listen(
map, ol.Object.getChangedEventType(ol.MapProperty.RESOLUTION),
this.handleMapChanged, false, this),
goog.events.listen(
map, ol.Object.getChangedEventType(ol.MapProperty.SIZE),
this.handleMapChanged, false, this)
];
this.handleMapLayersChanged();
}
};
/**
* @param {ol.layer.Layer} layer Layer.
* @param {boolean} mapIsDef Map is defined.

53
src/ol/control/control.js
View File

@@ -1,38 +1,73 @@
goog.provide('ol.control.Control');
goog.provide('ol.control.ControlOptions');
goog.require('goog.Disposable');
goog.require('ol.Map');
/**
* @typedef {{element: (Element|undefined),
* map: (ol.Map|undefined),
* target: (Element|undefined)}}
*/
ol.control.ControlOptions;
/**
* @constructor
* @extends {goog.Disposable}
* @param {ol.Map} map Map.
* @param {ol.control.ControlOptions} controlOptions Control options.
*/
ol.control.Control = function(map) {
ol.control.Control = function(controlOptions) {
goog.base(this);
/**
* @protected
* @type {Element}
*/
this.element = goog.isDef(controlOptions.element) ?
controlOptions.element : null;
/**
* @private
* @type {Element|undefined}
*/
this.target_ = controlOptions.target;
/**
* @private
* @type {ol.Map}
*/
this.map_ = map;
this.map_ = null;
if (goog.isDef(controlOptions.map)) {
this.setMap(controlOptions.map);
}
};
goog.inherits(ol.control.Control, goog.Disposable);
/**
* @return {Element} Element.
*/
ol.control.Control.prototype.getElement = goog.abstractMethod;
/**
* @return {ol.Map} Map.
*/
ol.control.Control.prototype.getMap = function() {
return this.map_;
};
/**
* @param {ol.Map} map Map.
*/
ol.control.Control.prototype.setMap = function(map) {
if (!goog.isNull(this.map_)) {
goog.dom.removeNode(this.element);
}
this.map_ = map;
if (!goog.isNull(this.map_)) {
var target = goog.isDef(this.target_) ? this.target_ : map.getViewport();
goog.dom.appendChild(target, this.element);
}
};

122
src/ol/control/dragbox.js
View File

@@ -1,122 +0,0 @@
goog.provide('ol.control.DragBox');
goog.require('goog.asserts');
goog.require('goog.dom');
goog.require('goog.dom.TagName');
goog.require('goog.events');
goog.require('goog.style');
goog.require('ol.Size');
goog.require('ol.control.Control');
/**
* @constructor
* @extends {ol.control.Control}
* @param {ol.Map} map Map.
* @param {ol.Coordinate=} opt_startCoordinate start coordinate of the box.
* If not provided, call {@link startBox} to start the box.
*/
ol.control.DragBox = function(map, opt_startCoordinate) {
goog.base(this, map);
/**
* @type {Element}
* @private
*/
this.divElement_ = goog.dom.createDom(goog.dom.TagName.DIV, 'ol-dragbox');
/**
* @type {ol.Pixel|undefined}
* @private
*/
this.startPixel_ = null;
if (goog.isDef(opt_startCoordinate)) {
this.startBox(opt_startCoordinate);
}
};
goog.inherits(ol.control.DragBox, ol.control.Control);
/**
* @inheritDoc
*/
ol.control.DragBox.prototype.getElement = function() {
return this.divElement_;
};
/**
* Adds a box to the map, at the specified coordinate. Dragging will change
* the size of the box.
* @param {ol.Coordinate} startCoordinate The coordinate to start the box at.
*/
ol.control.DragBox.prototype.startBox = function(startCoordinate) {
var map = this.getMap();
this.startPixel_ = map.getPixelFromCoordinate(startCoordinate);
goog.asserts.assert(goog.isDef(this.startPixel_));
goog.style.setPosition(this.divElement_, this.startPixel_);
goog.style.setBorderBoxSize(this.divElement_, new ol.Size(0, 0));
goog.dom.append(/** @type {!Node} */ (map.getViewport()), this.divElement_);
goog.events.listen(
map, ol.MapBrowserEvent.EventType.DRAG,
this.updateBox_, false, this);
goog.events.listen(
map, ol.MapBrowserEvent.EventType.DRAGEND,
this.finalizeBox_, false, this);
};
/**
* @param {ol.MapBrowserEvent} mapBrowserEvent The event to handle.
* @private
*/
ol.control.DragBox.prototype.updateBox_ = function(mapBrowserEvent) {
var map = this.getMap();
var coordinate = mapBrowserEvent.getCoordinate();
goog.asserts.assert(goog.isDef(coordinate));
var currentPixel = map.getPixelFromCoordinate(coordinate);
goog.style.setPosition(this.divElement_, new ol.Pixel(
Math.min(currentPixel.x, this.startPixel_.x),
Math.min(currentPixel.y, this.startPixel_.y)));
goog.style.setBorderBoxSize(this.divElement_, new ol.Size(
Math.abs(currentPixel.x - this.startPixel_.x),
Math.abs(currentPixel.y - this.startPixel_.y)));
};
/**
* @private
*/
ol.control.DragBox.prototype.finalizeBox_ = function() {
var map = this.getMap();
goog.events.unlisten(
map, ol.MapBrowserEvent.EventType.DRAG,
this.updateBox_, false, this);
goog.events.unlisten(
map, ol.MapBrowserEvent.EventType.DRAGEND,
this.finalizeBox_, false, this);
};
/**
* Removes the box from the map.
*/
ol.control.DragBox.prototype.removeBox = function() {
goog.dom.removeNode(this.divElement_);
};
/**
* @inheritDoc
*/
ol.control.DragBox.prototype.disposeInternal = function() {
this.finalizeBox_();
this.removeBox();
delete this.divElement_;
delete this.startPixel_;
goog.base(this, 'disposeInternal');
};

107
src/ol/control/mouseposition.js
View File

@@ -1,53 +1,66 @@
// FIXME should listen on appropriate pane, once it is defined
goog.provide('ol.control.MousePosition');
goog.provide('ol.control.MousePositionOptions');
goog.require('goog.events');
goog.require('goog.events.EventType');
goog.require('goog.style');
goog.require('ol.MapProperty');
goog.require('ol.Object');
goog.require('ol.Pixel');
goog.require('ol.Projection');
goog.require('ol.TransformFunction');
goog.require('ol.control.Control');
/**
* @typedef {{coordinateFormat: (ol.CoordinateFormatType|undefined),
* map: (ol.Map|undefined),
* projection: (ol.Projection|undefined),
* target: (Element|undefined),
* undefinedHtml: (string|undefined)}}
*/
ol.control.MousePositionOptions;
/**
* @constructor
* @extends {ol.control.Control}
* @param {ol.Map} map Map.
* @param {ol.Projection=} opt_projection Projection.
* @param {ol.CoordinateFormatType=} opt_coordinateFormat Coordinate format.
* @param {string=} opt_undefinedHTML Undefined HTML.
* @param {ol.control.MousePositionOptions} mousePositionOptions Mouse position
* options.
*/
ol.control.MousePosition =
function(map, opt_projection, opt_coordinateFormat, opt_undefinedHTML) {
ol.control.MousePosition = function(mousePositionOptions) {
goog.base(this, map);
var element = goog.dom.createDom(goog.dom.TagName.DIV, {
'class': 'ol-mouse-position'
});
goog.base(this, {
element: element,
map: mousePositionOptions.map,
target: mousePositionOptions.target
});
/**
* @private
* @type {Element}
* @type {ol.Projection|undefined}
*/
this.divElement_ = goog.dom.createElement(goog.dom.TagName.DIV);
/**
* @private
* @type {ol.Projection}
*/
this.projection_ = opt_projection || null;
this.projection_ = mousePositionOptions.projection;
/**
* @private
* @type {ol.CoordinateFormatType|undefined}
*/
this.coordinateFormat_ = opt_coordinateFormat;
this.coordinateFormat_ = mousePositionOptions.coordinateFormat;
/**
* @private
* @type {string}
*/
this.undefinedHTML_ = opt_undefinedHTML || '';
this.undefinedHtml_ = goog.isDef(mousePositionOptions.undefinedHtml) ?
mousePositionOptions.undefinedHtml : '';
/**
* @private
@@ -55,15 +68,11 @@ ol.control.MousePosition =
*/
this.transform_ = ol.Projection.identityTransform;
goog.events.listen(map,
ol.Object.getChangedEventType(ol.MapProperty.PROJECTION),
this.handleMapProjectionChanged, false, this);
goog.events.listen(map.getViewport(), goog.events.EventType.MOUSEMOVE,
this.handleMouseMove, false, this);
goog.events.listen(map.getViewport(), goog.events.EventType.MOUSEOUT,
this.handleMouseOut, false, this);
/**
* @private
* @type {Array.<number>}
*/
this.listenerKeys_ = [];
this.handleMapProjectionChanged();
@@ -71,28 +80,20 @@ ol.control.MousePosition =
goog.inherits(ol.control.MousePosition, ol.control.Control);
/**
* @inheritDoc
*/
ol.control.MousePosition.prototype.getElement = function() {
return this.divElement_;
};
/**
* @protected
*/
ol.control.MousePosition.prototype.handleMapProjectionChanged = function() {
var map = this.getMap();
var mapProjection = map.getProjection();
if (!goog.isDef(mapProjection) || goog.isNull(this.projection_)) {
if (!goog.isDef(mapProjection) || !goog.isDef(this.projection_)) {
this.transform_ = ol.Projection.identityTransform;
} else {
this.transform_ =
ol.Projection.getTransform(mapProjection, this.projection_);
}
// FIXME should we instead re-calculate using the last known mouse position?
this.divElement_.innerHTML = this.undefinedHTML_;
this.element.innerHTML = this.undefinedHtml_;
};
@@ -102,7 +103,9 @@ ol.control.MousePosition.prototype.handleMapProjectionChanged = function() {
*/
ol.control.MousePosition.prototype.handleMouseMove = function(browserEvent) {
var map = this.getMap();
var pixel = new ol.Pixel(browserEvent.offsetX, browserEvent.offsetY);
var eventPosition = goog.style.getRelativePosition(
browserEvent, map.getViewport());
var pixel = new ol.Pixel(eventPosition.x, eventPosition.y);
var coordinate = map.getCoordinateFromPixel(pixel);
var html;
if (goog.isDef(coordinate)) {
@@ -113,9 +116,9 @@ ol.control.MousePosition.prototype.handleMouseMove = function(browserEvent) {
html = coordinate.toString();
}
} else {
html = this.undefinedHTML_;
html = this.undefinedHtml_;
}
this.divElement_.innerHTML = html;
this.element.innerHTML = html;
};
@@ -124,5 +127,29 @@ ol.control.MousePosition.prototype.handleMouseMove = function(browserEvent) {
* @protected
*/
ol.control.MousePosition.prototype.handleMouseOut = function(browserEvent) {
this.divElement_.innerHTML = this.undefinedHTML_;
this.element.innerHTML = this.undefinedHtml_;
};
/**
* @inheritDoc
*/
ol.control.MousePosition.prototype.setMap = function(map) {
if (goog.isNull(this.listenerKeys_)) {
goog.array.forEach(this.listenerKeys_, goog.events.unlistenByKey);
}
this.listenerKeys_ = null;
goog.base(this, 'setMap', map);
if (!goog.isNull(map)) {
var viewport = map.getViewport();
this.listenerKeys = [
goog.events.listen(map,
ol.Object.getChangedEventType(ol.MapProperty.PROJECTION),
this.handleMapProjectionChanged, false, this),
goog.events.listen(viewport, goog.events.EventType.MOUSEMOVE,
this.handleMouseMove, false, this),
goog.events.listen(viewport, goog.events.EventType.MOUSEOUT,
this.handleMouseOut, false, this)
];
}
};

95
src/ol/control/zoom.js
View File

@@ -1,4 +1,5 @@
goog.provide('ol.control.Zoom');
goog.provide('ol.control.ZoomOptions');
goog.require('goog.dom');
goog.require('goog.dom.TagName');
@@ -8,67 +9,55 @@ goog.require('ol.Projection');
goog.require('ol.control.Control');
/**
* @typedef {{delta: (number|undefined),
* map: (ol.Map|undefined),
* target: (Element|undefined)}}
*/
ol.control.ZoomOptions;
/**
* @constructor
* @extends {ol.control.Control}
* @param {ol.Map} map Map.
* @param {number=} opt_zoomDelta Optional zoom delta.
* @param {ol.control.ZoomOptions} zoomOptions Zoom options.
*/
ol.control.Zoom = function(map, opt_zoomDelta) {
ol.control.Zoom = function(zoomOptions) {
goog.base(this, map);
var inElement = goog.dom.createDom(goog.dom.TagName.A, {
'href': '#zoomIn',
'class': 'ol-zoom-in'
}, '+');
goog.events.listen(
inElement, goog.events.EventType.CLICK, this.handleIn_, false, this);
var outElement = goog.dom.createDom(goog.dom.TagName.A, {
'href': '#zoomOut',
'class': 'ol-zoom-out'
}, '\u2212');
goog.events.listen(
outElement, goog.events.EventType.CLICK, this.handleOut_, false, this);
var element = goog.dom.createDom(
goog.dom.TagName.DIV, 'ol-zoom', inElement, outElement);
goog.base(this, {
element: element,
map: zoomOptions.map,
target: zoomOptions.target
});
/**
* @type {number}
* @private
*/
this.zoomDelta_ = goog.isDef(opt_zoomDelta) ? opt_zoomDelta : 1;
/**
* @type {Element}
* @private
*/
this.divElement_ = goog.dom.createDom(goog.dom.TagName.DIV, 'ol-zoom');
/**
* @type {Element}
* @private
*/
this.inButton_ = goog.dom.createDom(goog.dom.TagName.DIV, 'ol-zoom-in',
goog.dom.createDom(goog.dom.TagName.A, {'href': '#zoomIn'}));
/**
* @type {Element}
* @private
*/
this.outButton_ = goog.dom.createDom(goog.dom.TagName.DIV, 'ol-zoom-out',
goog.dom.createDom(goog.dom.TagName.A, {'href': '#zoomOut'}));
goog.dom.setTextContent(
/** @type {Element} */ (this.inButton_.firstChild), '+');
goog.dom.setTextContent(
/** @type {Element} */ (this.outButton_.firstChild), '\u2212');
goog.dom.append(this.divElement_, this.inButton_, this.outButton_);
goog.dom.append(/** @type {!Node} */ (map.getViewport()), this.divElement_);
goog.events.listen(this.inButton_, goog.events.EventType.CLICK,
this.handleIn_, false, this);
goog.events.listen(this.outButton_, goog.events.EventType.CLICK,
this.handleOut_, false, this);
this.delta_ = goog.isDef(zoomOptions.delta) ? zoomOptions.delta : 1;
};
goog.inherits(ol.control.Zoom, ol.control.Control);
/**
* @inheritDoc
*/
ol.control.Zoom.prototype.getElement = function() {
return this.divElement_;
};
/**
* @param {goog.events.BrowserEvent} browserEvent The browser event to handle.
* @private
@@ -76,7 +65,7 @@ ol.control.Zoom.prototype.getElement = function() {
ol.control.Zoom.prototype.handleIn_ = function(browserEvent) {
browserEvent.stopPropagation();
browserEvent.preventDefault();
this.getMap().zoom(this.zoomDelta_);
this.getMap().zoom(this.delta_);
};
@@ -87,17 +76,5 @@ ol.control.Zoom.prototype.handleIn_ = function(browserEvent) {
ol.control.Zoom.prototype.handleOut_ = function(browserEvent) {
browserEvent.stopPropagation();
browserEvent.preventDefault();
this.getMap().zoom(-this.zoomDelta_);
};
/**
* @inheritDoc
*/
ol.control.Zoom.prototype.disposeInternal = function() {
goog.dom.removeNode(this.divElement_);
delete this.inButton_;
delete this.outButton_;
delete this.divElement_;
goog.base(this, 'disposeInternal');
this.getMap().zoom(-this.delta_);
};

15
src/ol/renderer/dom/tilelayer.js
View File

@@ -153,6 +153,19 @@ ol.renderer.dom.TileLayer.prototype.handleTileChange_ = function(event) {
};
/**
* Remove all loading tiles that have been appended.
* @private
*/
ol.renderer.dom.TileLayer.prototype.removeLoadingTiles_ = function() {
for (var key in this.loadingTiles_) {
var tile = this.loadingTiles_[key];
goog.dom.removeNode(tile.getImage(this));
delete this.loadingTiles_[key];
}
};
/**
* @inheritDoc
*/
@@ -175,7 +188,7 @@ ol.renderer.dom.TileLayer.prototype.render = function() {
if (z != this.renderedZ_) {
// no longer wait for previously loading tiles
this.loadingTiles_ = {};
this.removeLoadingTiles_();
}
/**