map target is now map container

This commit is contained in:
Éric Lemoine
2012-08-20 21:44:29 +02:00
parent ca2b6e4189
commit 66d4d199b4

View File

@@ -77,7 +77,7 @@ ol.MapPaneZIndex = {
* @constructor
* @extends {ol.Object}
* @implements {goog.fx.anim.Animated}
* @param {Element} target Target.
* @param {Element} container Container.
* @param {function(new: ol.MapRenderer, Element, ol.Map)} rendererConstructor
* Renderer constructor.
* @param {Object=} opt_values Values.
@@ -85,7 +85,7 @@ ol.MapPaneZIndex = {
* Viewport size monitor.
*/
ol.Map = function(
target, rendererConstructor, opt_values, opt_viewportSizeMonitor) {
container, rendererConstructor, opt_values, opt_viewportSizeMonitor) {
goog.base(this);
@@ -142,7 +142,7 @@ ol.Map = function(
this.viewport_.style.width = '100%';
this.viewport_.style.height = '100%';
this.viewport_.style.zIndex = ol.MapPaneZIndex.VIEWPORT;
goog.dom.appendChild(target, this.viewport_);
goog.dom.appendChild(container, this.viewport_);
goog.events.listen(this.viewport_, [
goog.events.EventType.DBLCLICK
@@ -176,12 +176,6 @@ ol.Map = function(
this.renderer_ = new rendererConstructor(this.viewport_, this);
this.registerDisposable(this.renderer_);
/**
* @private
* @type {Element}
*/
this.target_ = target;
/**
* @private
* @type {goog.dom.ViewportSizeMonitor}
@@ -272,6 +266,14 @@ goog.exportProperty(
ol.Map.prototype.getCenter);
/**
* @return {Element} Container.
*/
ol.Map.prototype.getContainer = function() {
return this.container_;
};
/**
* @param {ol.Pixel} pixel Pixel.
* @return {ol.Coordinate|undefined} Coordinate.
@@ -426,14 +428,6 @@ goog.exportProperty(
ol.Map.prototype.getSize);
/**
* @return {Element} Target.
*/
ol.Map.prototype.getTarget = function() {
return this.target_;
};
/**
* @return {ol.Coordinate|undefined} Center in user projection.
*/
@@ -527,7 +521,8 @@ ol.Map.prototype.handleUserProjectionChanged = function() {
* @protected
*/
ol.Map.prototype.handleViewportResize = function() {
var size = new ol.Size(this.target_.clientWidth, this.target_.clientHeight);
var size = new ol.Size(this.container_.clientWidth,
this.container_.clientHeight);
this.setSize(size);
};