Merge branch 'master' of https://github.com/openlayers/ol3

2012-06-22 14:53:53 +02:00
parent 6cfb942ff9 675dd2b47e
commit 976239816e
15 changed files with 1015 additions and 94 deletions
@@ -385,6 +385,25 @@ ol.Map.prototype.moveByPx = function(dx, dy) {
    // call moveByPx on renderers
 };

+/**
+ * @param {ol.Loc} loc the location being requested 
+ * @returns {Object} the 
+ */
+ol.Map.prototype.getViewportPosition = function(loc) {
+    //TODO: delegate this to the renderers
+    //stub for now to get popups working
+    return {x: 200, y: 300};
+};
+
+/**
+ * @returns {Element} the map overlay element
+ */
+ol.Map.prototype.getMapOverlay = function() {
+    //TODO: delegate this to the renderers
+    //stub for now to get popups working
+    return this.mapOverlay_
+};
+
 /**
 * @export
 */