Update externs and ol.HAVE_PROJ4JS for new proj4js API

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;
+proj4.defs;
-
-
-/**
- * @type {function(string)}
- */
-Proj4js.reportError;
 
 
 
 /**
  * @constructor
- * @param {number} x
+ * @param {Object|string} proj
- * @param {number} y
  */
-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;
+proj4.Proj.prototype.to_meter;
-
-
-/**
- * @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;};

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';
 
 
 /**