From 4c1d2f8c8653089f1f4784dc73f01422dabf9bed Mon Sep 17 00:00:00 2001
From: Frederic Junod <frederic.junod@camptocamp.com>
Date: Tue, 7 Oct 2014 10:41:30 +0200
Subject: [PATCH 1/2] Remove reprojectTo option from olx.source.OSMXMLOptions

Leftover from #1640
---
 externs/olx.js                | 9 ---------
 src/ol/source/osmxmlsource.js | 1 -
 2 files changed, 10 deletions(-)

diff --git a/externs/olx.js b/externs/olx.js
index 97751c1f56..a08a0621d7 100644
--- a/externs/olx.js
+++ b/externs/olx.js
@@ -4084,7 +4084,6 @@ olx.source.OSMOptions.prototype.url;
  *     logo: (string|olx.LogoOptions|undefined),
  *     node: (Node|undefined),
  *     projection: ol.proj.ProjectionLike,
- *     reprojectTo: ol.proj.ProjectionLike,
  *     text: (string|undefined),
  *     url: (string|undefined),
  *     urls: (Array.<string>|undefined)}}
@@ -4133,14 +4132,6 @@ olx.source.OSMXMLOptions.prototype.node;
 olx.source.OSMXMLOptions.prototype.projection;
 
 
-/**
- * Re-project to.
- * @type {ol.proj.ProjectionLike}
- * @api
- */
-olx.source.OSMXMLOptions.prototype.reprojectTo;
-
-
 /**
  * Text.
  * @type {string|undefined}
diff --git a/src/ol/source/osmxmlsource.js b/src/ol/source/osmxmlsource.js
index 14107f006e..d1ba44f49b 100644
--- a/src/ol/source/osmxmlsource.js
+++ b/src/ol/source/osmxmlsource.js
@@ -26,7 +26,6 @@ ol.source.OSMXML = function(opt_options) {
     logo: options.logo,
     node: options.node,
     projection: options.projection,
-    reprojectTo: options.reprojectTo,
     text: options.text,
     url: options.url,
     urls: options.urls

From ec129f5778fdbbae8c61bd522dc2593ed2fc098b Mon Sep 17 00:00:00 2001
From: Frederic Junod <frederic.junod@camptocamp.com>
Date: Tue, 7 Oct 2014 11:40:36 +0200
Subject: [PATCH 2/2] Rename reprojectTo option to projection

---
 externs/olx.js                               | 4 ++--
 src/ol/interaction/draganddropinteraction.js | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/externs/olx.js b/externs/olx.js
index a08a0621d7..049308fff4 100644
--- a/externs/olx.js
+++ b/externs/olx.js
@@ -1893,7 +1893,7 @@ olx.interaction.DoubleClickZoomOptions.prototype.delta;
 
 /**
  * @typedef {{formatConstructors: (Array.<function(new: ol.format.Feature)>|undefined),
- *     reprojectTo: ol.proj.ProjectionLike}}
+ *     projection: ol.proj.ProjectionLike}}
  * @api
  */
 olx.interaction.DragAndDropOptions;
@@ -1912,7 +1912,7 @@ olx.interaction.DragAndDropOptions.prototype.formatConstructors;
  * @type {ol.proj.ProjectionLike}
  * @api
  */
-olx.interaction.DragAndDropOptions.prototype.reprojectTo;
+olx.interaction.DragAndDropOptions.prototype.projection;
 
 
 /**
diff --git a/src/ol/interaction/draganddropinteraction.js b/src/ol/interaction/draganddropinteraction.js
index 7ad970635d..382e27d8ea 100644
--- a/src/ol/interaction/draganddropinteraction.js
+++ b/src/ol/interaction/draganddropinteraction.js
@@ -42,8 +42,8 @@ ol.interaction.DragAndDrop = function(opt_options) {
    * @private
    * @type {ol.proj.Projection}
    */
-  this.reprojectTo_ = goog.isDef(options.reprojectTo) ?
-      ol.proj.get(options.reprojectTo) : null;
+  this.projection_ = goog.isDef(options.projection) ?
+      ol.proj.get(options.projection) : null;
 
   /**
    * @private
@@ -97,7 +97,7 @@ ol.interaction.DragAndDrop.prototype.handleDrop_ = function(event) {
 ol.interaction.DragAndDrop.prototype.handleResult_ = function(file, result) {
   var map = this.getMap();
   goog.asserts.assert(!goog.isNull(map));
-  var projection = this.reprojectTo_;
+  var projection = this.projection_;
   if (goog.isNull(projection)) {
     var view = map.getView();
     goog.asserts.assert(!goog.isNull(view));