From dc09b0a27f6c2b84d93addd07279d9c31c52d329 Mon Sep 17 00:00:00 2001
From: Andreas Hocevar <andreas.hocevar@gmail.com>
Date: Tue, 8 Jul 2014 01:01:54 +0200
Subject: [PATCH] Update externs and ol.HAVE_PROJ4JS for new proj4js API

---
 externs/proj4js.js  | 88 ++++++++++-----------------------------------
 src/ol/proj/proj.js |  2 +-
 2 files changed, 20 insertions(+), 70 deletions(-)

diff --git a/externs/proj4js.js b/externs/proj4js.js
index d91a06b561..d8e42e1d72 100644
--- a/externs/proj4js.js
+++ b/externs/proj4js.js
@@ -1,92 +1,42 @@
 /**
  * @externs
- * @see http://trac.osgeo.org/proj4js/
+ * @see http://proj4js.org/
  */
 
 
 /**
- * @type {Object}
+ * @type {Function}
  */
-var Proj4js = {};
+var proj4 = function() {};
 
 
 /**
  * @type {Object.<string, string>}
  */
-Proj4js.defs;
-
-
-/**
- * @type {function(string)}
- */
-Proj4js.reportError;
+proj4.defs;
 
 
 
 /**
  * @constructor
- * @param {number} x
- * @param {number} y
+ * @param {Object|string} proj
  */
-Proj4js.Point = function(x, y) {};
+proj4.Proj = function(proj) {};
+
+
+/**
+ * @type {string}
+ */
+proj4.Proj.prototype.axis;
+
+
+/**
+ * @type {string}
+ */
+proj4.Proj.prototype.units;
 
 
 /**
  * @type {number}
  */
-Proj4js.Point.prototype.x;
-
-
-/**
- * @type {number}
- */
-Proj4js.Point.prototype.y;
-
-
-
-/**
- * @constructor
- * @param {string} srsCode
- * @param {Function=} opt_callback
- */
-Proj4js.Proj = function(srsCode, opt_callback) {};
-
-
-/**
- * @type {string}
- */
-Proj4js.Proj.prototype.axis;
-
-
-/**
- * @type {string}
- */
-Proj4js.Proj.prototype.title;
-
-
-/**
- * @type {string}
- */
-Proj4js.Proj.prototype.units;
-
-
-/**
- * @type {string}
- */
-Proj4js.Proj.prototype.srsCode;
-
-
-/**
- * @type {number}
- */
-Proj4js.Proj.prototype.to_meter;
-
-
-/**
- * @nosideeffects
- * @param {Proj4js.Proj} source
- * @param {Proj4js.Proj} dest
- * @param {Proj4js.Point|{x:number, y:number}} point
- * @return {Proj4js.Point}
- */
-Proj4js.transform = function(source, dest, point) {return null;};
+proj4.Proj.prototype.to_meter;
diff --git a/src/ol/proj/proj.js b/src/ol/proj/proj.js
index 421874a57f..c205ffffe8 100644
--- a/src/ol/proj/proj.js
+++ b/src/ol/proj/proj.js
@@ -19,7 +19,7 @@ goog.require('ol.sphere.NORMAL');
  * @const
  * @type {boolean}
  */
-ol.HAVE_PROJ4JS = ol.ENABLE_PROJ4JS && typeof Proj4js == 'object';
+ol.HAVE_PROJ4JS = ol.ENABLE_PROJ4JS && typeof proj4 == 'function';
 
 
 /**