proj4 2.15.0 → 2.16.1

package/lib/datumUtils.js

@@ -1,5 +1,5 @@
 'use strict';
-import {PJD_3PARAM, PJD_7PARAM, HALF_PI} from './constants/values';
+import { PJD_3PARAM, PJD_7PARAM, HALF_PI } from './constants/values';
 export function compareDatums(source, dest) {
   if (source.datum_type !== dest.datum_type) {
     return false; // false, datums are not equal
@@ -32,7 +32,7 @@ export function compareDatums(source, dest) {
 export function geodeticToGeocentric(p, es, a) {
   var Longitude = p.x;
   var Latitude = p.y;
-  var Height = p.z ? p.z : 0; //Z value not always supplied
+  var Height = p.z ? p.z : 0; // Z value not always supplied
 
   var Rn; /*  Earth radius at location  */
   var Sin_Lat; /*  Math.sin(Latitude)  */
@@ -50,7 +50,7 @@ export function geodeticToGeocentric(p, es, a) {
     Latitude = HALF_PI;
   } else if (Latitude < -HALF_PI) {
     /* Latitude out of range */
-    //..reportError('geocent:lat out of range:' + Latitude);
+    // ..reportError('geocent:lat out of range:' + Latitude);
     return { x: -Infinity, y: -Infinity, z: p.z };
   } else if (Latitude > HALF_PI) {
     /* Latitude out of range */
@@ -94,7 +94,7 @@ export function geocentricToGeodetic(p, es, a, b) {
 
   var X = p.x;
   var Y = p.y;
-  var Z = p.z ? p.z : 0.0; //Z value not always supplied
+  var Z = p.z ? p.z : 0.0; // Z value not always supplied
   var Longitude;
   var Latitude;
   var Height;
@@ -104,7 +104,6 @@ export function geocentricToGeodetic(p, es, a, b) {
 
   /*      special cases for latitude and longitude */
   if (P / a < genau) {
-
     /*  special case, if P=0. (X=0., Y=0.) */
     Longitude = 0.0;
 
@@ -173,21 +172,19 @@ export function geocentricToGeodetic(p, es, a, b) {
 // pj_geocentic_to_wgs84( p )
 //  p = point to transform in geocentric coordinates (x,y,z)
 
-
 /** point object, nothing fancy, just allows values to be
     passed back and forth by reference rather than by value.
     Other point classes may be used as long as they have
     x and y properties, which will get modified in the transform method.
 */
 export function geocentricToWgs84(p, datum_type, datum_params) {
-
   if (datum_type === PJD_3PARAM) {
     // if( x[io] === HUGE_VAL )
     //    continue;
     return {
       x: p.x + datum_params[0],
       y: p.y + datum_params[1],
-      z: p.z + datum_params[2],
+      z: p.z + datum_params[2]
     };
   } else if (datum_type === PJD_7PARAM) {
     var Dx_BF = datum_params[0];
@@ -212,16 +209,14 @@ export function geocentricToWgs84(p, datum_type, datum_params) {
 //  coordinate system definition,
 //  point to transform in geocentric coordinates (x,y,z)
 export function geocentricFromWgs84(p, datum_type, datum_params) {
-
   if (datum_type === PJD_3PARAM) {
-    //if( x[io] === HUGE_VAL )
+    // if( x[io] === HUGE_VAL )
     //    continue;
     return {
       x: p.x - datum_params[0],
       y: p.y - datum_params[1],
-      z: p.z - datum_params[2],
+      z: p.z - datum_params[2]
     };
-
   } else if (datum_type === PJD_7PARAM) {
     var Dx_BF = datum_params[0];
     var Dy_BF = datum_params[1];
@@ -233,7 +228,7 @@ export function geocentricFromWgs84(p, datum_type, datum_params) {
     var x_tmp = (p.x - Dx_BF) / M_BF;
     var y_tmp = (p.y - Dy_BF) / M_BF;
     var z_tmp = (p.z - Dz_BF) / M_BF;
-    //if( x[io] === HUGE_VAL )
+    // if( x[io] === HUGE_VAL )
     //    continue;
 
     return {
@@ -241,5 +236,5 @@ export function geocentricFromWgs84(p, datum_type, datum_params) {
       y: -Rz_BF * x_tmp + y_tmp + Rx_BF * z_tmp,
       z: Ry_BF * x_tmp - Rx_BF * y_tmp + z_tmp
     };
-  } //cs_geocentric_from_wgs84()
+  } // cs_geocentric_from_wgs84()
 }

package/lib/datum_transform.js

@@ -8,13 +8,13 @@ import {
   SRS_WGS84_SEMIMAJOR, SRS_WGS84_SEMIMINOR
 } from './constants/values';
 
-import {geodeticToGeocentric, geocentricToGeodetic, geocentricToWgs84, geocentricFromWgs84, compareDatums} from './datumUtils';
-import adjust_lon from "./common/adjust_lon";
+import { geodeticToGeocentric, geocentricToGeodetic, geocentricToWgs84, geocentricFromWgs84, compareDatums } from './datumUtils';
+import adjust_lon from './common/adjust_lon';
 function checkParams(type) {
   return (type === PJD_3PARAM || type === PJD_7PARAM);
 }
 
-export default function(source, dest, point) {
+export default function (source, dest, point) {
   // Short cut if the datums are identical.
   if (compareDatums(source, dest)) {
     return point; // in this case, zero is sucess,
@@ -49,7 +49,7 @@ export default function(source, dest, point) {
   }
 
   // Do we need to go through geocentric coordinates?
-  if (source_es === dest_es && source_a === dest_a && !checkParams(source.datum_type) &&  !checkParams(dest.datum_type)) {
+  if (source_es === dest_es && source_a === dest_a && !checkParams(source.datum_type) && !checkParams(dest.datum_type)) {
     return point;
   }
 
@@ -79,9 +79,8 @@ export function applyGridShift(source, inverse, point) {
     console.log('Grid shift grids not found');
     return -1;
   }
-  var input = {x: -point.x, y: point.y};
-  var output = {x: Number.NaN, y: Number.NaN};
-  var onlyMandatoryGrids = false;
+  var input = { x: -point.x, y: point.y };
+  var output = { x: Number.NaN, y: Number.NaN };
   var attemptedGrids = [];
   outer:
   for (var i = 0; i < source.grids.length; i++) {
@@ -91,10 +90,9 @@ export function applyGridShift(source, inverse, point) {
       output = input;
       break;
     }
-    onlyMandatoryGrids = grid.mandatory;
     if (grid.grid === null) {
       if (grid.mandatory) {
-        console.log("Unable to find mandatory grid '" + grid.name + "'");
+        console.log('Unable to find mandatory grid \'' + grid.name + '\'');
         return -1;
       }
       continue;
@@ -108,7 +106,7 @@ export function applyGridShift(source, inverse, point) {
       var minY = subgrid.ll[1] - epsilon;
       var maxX = subgrid.ll[0] + (subgrid.lim[0] - 1) * subgrid.del[0] + epsilon;
       var maxY = subgrid.ll[1] + (subgrid.lim[1] - 1) * subgrid.del[1] + epsilon;
-      if (minY > input.y || minX > input.x || maxY < input.y || maxX < input.x ) {
+      if (minY > input.y || minX > input.x || maxY < input.y || maxX < input.x) {
         continue;
       }
       output = applySubgridShift(input, inverse, subgrid);
@@ -118,8 +116,8 @@ export function applyGridShift(source, inverse, point) {
     }
   }
   if (isNaN(output.x)) {
-    console.log("Failed to find a grid shift table for location '"+
-      -input.x * R2D + " " + input.y * R2D + " tried: '" + attemptedGrids + "'");
+    console.log('Failed to find a grid shift table for location \''
+      + -input.x * R2D + ' ' + input.y * R2D + ' tried: \'' + attemptedGrids + '\'');
     return -1;
   }
   point.x = -output.x;
@@ -128,9 +126,11 @@ export function applyGridShift(source, inverse, point) {
 }
 
 function applySubgridShift(pin, inverse, ct) {
-  var val = {x: Number.NaN, y: Number.NaN};
-  if (isNaN(pin.x)) { return val; }
-  var tb = {x: pin.x, y: pin.y};
+  var val = { x: Number.NaN, y: Number.NaN };
+  if (isNaN(pin.x)) {
+    return val;
+  }
+  var tb = { x: pin.x, y: pin.y };
   tb.x -= ct.ll[0];
   tb.y -= ct.ll[1];
   tb.x = adjust_lon(tb.x - Math.PI) + Math.PI;
@@ -146,15 +146,15 @@ function applySubgridShift(pin, inverse, ct) {
     do {
       del = nadInterpolate(t, ct);
       if (isNaN(del.x)) {
-        console.log("Inverse grid shift iteration failed, presumably at grid edge.  Using first approximation.");
+        console.log('Inverse grid shift iteration failed, presumably at grid edge.  Using first approximation.');
         break;
       }
-      dif = {x: tb.x - (del.x + t.x), y: tb.y - (del.y + t.y)};
+      dif = { x: tb.x - (del.x + t.x), y: tb.y - (del.y + t.y) };
       t.x += dif.x;
       t.y += dif.y;
     } while (i-- && Math.abs(dif.x) > tol && Math.abs(dif.y) > tol);
     if (i < 0) {
-      console.log("Inverse grid shift iterator failed to converge.");
+      console.log('Inverse grid shift iterator failed to converge.');
       return val;
     }
     val.x = adjust_lon(t.x + ct.ll[0]);
@@ -169,10 +169,10 @@ function applySubgridShift(pin, inverse, ct) {
 }
 
 function nadInterpolate(pin, ct) {
-  var t = {x: pin.x / ct.del[0], y: pin.y / ct.del[1]};
-  var indx = {x: Math.floor(t.x), y: Math.floor(t.y)};
-  var frct = {x: t.x - 1.0 * indx.x, y: t.y - 1.0 * indx.y};
-  var val= {x: Number.NaN, y: Number.NaN};
+  var t = { x: pin.x / ct.del[0], y: pin.y / ct.del[1] };
+  var indx = { x: Math.floor(t.x), y: Math.floor(t.y) };
+  var frct = { x: t.x - 1.0 * indx.x, y: t.y - 1.0 * indx.y };
+  var val = { x: Number.NaN, y: Number.NaN };
   var inx;
   if (indx.x < 0 || indx.x >= ct.lim[0]) {
     return val;
@@ -181,13 +181,13 @@ function nadInterpolate(pin, ct) {
     return val;
   }
   inx = (indx.y * ct.lim[0]) + indx.x;
-  var f00 = {x: ct.cvs[inx][0], y: ct.cvs[inx][1]};
+  var f00 = { x: ct.cvs[inx][0], y: ct.cvs[inx][1] };
   inx++;
-  var f10= {x: ct.cvs[inx][0], y: ct.cvs[inx][1]};
+  var f10 = { x: ct.cvs[inx][0], y: ct.cvs[inx][1] };
   inx += ct.lim[0];
-  var f11 = {x: ct.cvs[inx][0], y: ct.cvs[inx][1]};
+  var f11 = { x: ct.cvs[inx][0], y: ct.cvs[inx][1] };
   inx--;
-  var f01 = {x: ct.cvs[inx][0], y: ct.cvs[inx][1]};
+  var f01 = { x: ct.cvs[inx][0], y: ct.cvs[inx][1] };
   var m11 = frct.x * frct.y, m10 = frct.x * (1.0 - frct.y),
     m00 = (1.0 - frct.x) * (1.0 - frct.y), m01 = (1.0 - frct.x) * frct.y;
   val.x = (m00 * f00.x + m10 * f10.x + m01 * f01.x + m11 * f11.x);

package/lib/defs.js

@@ -3,53 +3,43 @@ import parseProj from './projString';
 import wkt from 'wkt-parser';
 
 function defs(name) {
-  /*global console*/
+  /* global console */
   var that = this;
   if (arguments.length === 2) {
     var def = arguments[1];
     if (typeof def === 'string') {
       if (def.charAt(0) === '+') {
         defs[name] = parseProj(arguments[1]);
-      }
-      else {
+      } else {
         defs[name] = wkt(arguments[1]);
       }
     } else {
       defs[name] = def;
     }
-  }
-  else if (arguments.length === 1) {
+  } else if (arguments.length === 1) {
     if (Array.isArray(name)) {
-      return name.map(function(v) {
+      return name.map(function (v) {
         if (Array.isArray(v)) {
           defs.apply(that, v);
-        }
-        else {
+        } else {
           defs(v);
         }
       });
-    }
-    else if (typeof name === 'string') {
+    } else if (typeof name === 'string') {
       if (name in defs) {
         return defs[name];
       }
-    }
-    else if ('EPSG' in name) {
+    } else if ('EPSG' in name) {
       defs['EPSG:' + name.EPSG] = name;
-    }
-    else if ('ESRI' in name) {
+    } else if ('ESRI' in name) {
       defs['ESRI:' + name.ESRI] = name;
-    }
-    else if ('IAU2000' in name) {
+    } else if ('IAU2000' in name) {
       defs['IAU2000:' + name.IAU2000] = name;
-    }
-    else {
+    } else {
       console.log(name);
     }
     return;
   }
-
-
 }
 globals(defs);
 export default defs;

package/lib/deriveConstants.js

@@ -1,7 +1,9 @@
-import {SIXTH, RA4, RA6, EPSLN} from './constants/values';
-import {default as Ellipsoid, WGS84} from './constants/Ellipsoid';
+import { SIXTH, RA4, RA6, EPSLN } from './constants/values';
+import { default as Ellipsoid } from './constants/Ellipsoid';
 import match from './match';
 
+const WGS84 = Ellipsoid.WGS84; // default ellipsoid
+
 export function eccentricity(a, b, rf, R_A) {
   var a2 = a * a; // used in geocentric
   var b2 = b * b; // used in geocentric

package/lib/extend.js

@@ -1,4 +1,4 @@
-export default function(destination, source) {
+export default function (destination, source) {
   destination = destination || {};
   var value, property;
   if (!source) {

package/lib/global.js

@@ -1,11 +1,11 @@
-export default function(defs) {
-  defs('EPSG:4326', "+title=WGS 84 (long/lat) +proj=longlat +ellps=WGS84 +datum=WGS84 +units=degrees");
-  defs('EPSG:4269', "+title=NAD83 (long/lat) +proj=longlat +a=6378137.0 +b=6356752.31414036 +ellps=GRS80 +datum=NAD83 +units=degrees");
-  defs('EPSG:3857', "+title=WGS 84 / Pseudo-Mercator +proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +no_defs");
+export default function (defs) {
+  defs('EPSG:4326', '+title=WGS 84 (long/lat) +proj=longlat +ellps=WGS84 +datum=WGS84 +units=degrees');
+  defs('EPSG:4269', '+title=NAD83 (long/lat) +proj=longlat +a=6378137.0 +b=6356752.31414036 +ellps=GRS80 +datum=NAD83 +units=degrees');
+  defs('EPSG:3857', '+title=WGS 84 / Pseudo-Mercator +proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +no_defs');
   // UTM WGS84
   for (var i = 1; i <= 60; ++i) {
-    defs('EPSG:' + (32600 + i), "+proj=utm +zone=" + i + " +datum=WGS84 +units=m");
-    defs('EPSG:' + (32700 + i), "+proj=utm +zone=" + i + " +south +datum=WGS84 +units=m");
+    defs('EPSG:' + (32600 + i), '+proj=utm +zone=' + i + ' +datum=WGS84 +units=m');
+    defs('EPSG:' + (32700 + i), '+proj=utm +zone=' + i + ' +south +datum=WGS84 +units=m');
   }
 
   defs.WGS84 = defs['EPSG:4326'];

package/lib/includedProjections.js

@@ -1,33 +1,33 @@
-import tmerc from "./projections/tmerc";
-import utm from "./projections/utm";
-import sterea from "./projections/sterea";
-import stere from "./projections/stere";
-import somerc from "./projections/somerc";
-import omerc from "./projections/omerc";
-import lcc from "./projections/lcc";
-import krovak from "./projections/krovak";
-import cass from "./projections/cass";
-import laea from "./projections/laea";
-import aea from "./projections/aea";
-import gnom from "./projections/gnom";
-import cea from "./projections/cea";
-import eqc from "./projections/eqc";
-import poly from "./projections/poly";
-import nzmg from "./projections/nzmg";
-import mill from "./projections/mill";
-import sinu from "./projections/sinu";
-import moll from "./projections/moll";
-import eqdc from "./projections/eqdc";
-import vandg from "./projections/vandg";
-import aegd from "./projections/aeqd";
+import tmerc from './projections/tmerc';
+import utm from './projections/utm';
+import sterea from './projections/sterea';
+import stere from './projections/stere';
+import somerc from './projections/somerc';
+import omerc from './projections/omerc';
+import lcc from './projections/lcc';
+import krovak from './projections/krovak';
+import cass from './projections/cass';
+import laea from './projections/laea';
+import aea from './projections/aea';
+import gnom from './projections/gnom';
+import cea from './projections/cea';
+import eqc from './projections/eqc';
+import poly from './projections/poly';
+import nzmg from './projections/nzmg';
+import mill from './projections/mill';
+import sinu from './projections/sinu';
+import moll from './projections/moll';
+import eqdc from './projections/eqdc';
+import vandg from './projections/vandg';
+import aegd from './projections/aeqd';
 import etmerc from './projections/etmerc';
 import qsc from './projections/qsc';
 import robin from './projections/robin';
 import geocent from './projections/geocent';
 import tpers from './projections/tpers';
 import geos from './projections/geos';
-import eqearth from "./projections/eqearth";
-import bonne from "./projections/bonne";
+import eqearth from './projections/eqearth';
+import bonne from './projections/bonne';
 
 var projs = [
   tmerc,
@@ -66,4 +66,4 @@ export default function (proj4) {
   projs.forEach(function (proj) {
     proj4.Proj.projections.add(proj);
   });
-}
+}

package/lib/index.js

@@ -1,14 +1,14 @@
 import proj4 from './core';
-import Proj from "./Proj";
-import Point from "./Point";
-import common from "./common/toPoint";
-import defs from "./defs";
-import nadgrid from "./nadgrid";
-import transform from "./transform";
-import mgrs from "mgrs";
-import includedProjections from "../projs";
+import Proj from './Proj';
+import Point from './Point';
+import common from './common/toPoint';
+import defs from './defs';
+import nadgrid from './nadgrid';
+import transform from './transform';
+import mgrs from 'mgrs';
+import includedProjections from '../projs';
 
-proj4.defaultDatum = 'WGS84'; //default datum
+proj4.defaultDatum = 'WGS84'; // default datum
 proj4.Proj = Proj;
 proj4.WGS84 = new proj4.Proj('WGS84');
 proj4.Point = Point;

package/lib/nadgrid.js

@@ -10,12 +10,16 @@ var loadedNadgrids = {};
  * Load a binary NTv2 file (.gsb) to a key that can be used in a proj string like +nadgrids=<key>. Pass the NTv2 file
  * as an ArrayBuffer.
  */
-export default function nadgrid(key, data) {
+export default function nadgrid(key, data, options) {
+  var includeErrorFields = true;
+  if (options !== undefined && options.includeErrorFields === false) {
+    includeErrorFields = false;
+  }
   var view = new DataView(data);
   var isLittleEndian = detectLittleEndian(view);
   var header = readHeader(view, isLittleEndian);
-  var subgrids = readSubgrids(view, header, isLittleEndian);
-  var nadgrid = {header: header, subgrids: subgrids};
+  var subgrids = readSubgrids(view, header, isLittleEndian, includeErrorFields);
+  var nadgrid = { header: header, subgrids: subgrids };
   loadedNadgrids[key] = nadgrid;
   return nadgrid;
 }
@@ -25,7 +29,9 @@ export default function nadgrid(key, data) {
  */
 export function getNadgrids(nadgrids) {
   // Format details: http://proj.maptools.org/gen_parms.html
-  if (nadgrids === undefined) { return null; }
+  if (nadgrids === undefined) {
+    return null;
+  }
   var grids = nadgrids.split(',');
   return grids.map(parseNadgridString);
 }
@@ -39,7 +45,7 @@ function parseNadgridString(value) {
     value = value.slice(1);
   }
   if (value === 'null') {
-    return {name: 'null', mandatory: !optional, grid: null, isNull: true};
+    return { name: 'null', mandatory: !optional, grid: null, isNull: true };
   }
   return {
     name: value,
@@ -74,7 +80,7 @@ function readHeader(view, isLittleEndian) {
     fromSemiMajorAxis: view.getFloat64(120, isLittleEndian),
     fromSemiMinorAxis: view.getFloat64(136, isLittleEndian),
     toSemiMajorAxis: view.getFloat64(152, isLittleEndian),
-    toSemiMinorAxis: view.getFloat64(168, isLittleEndian),
+    toSemiMinorAxis: view.getFloat64(168, isLittleEndian)
   };
 }
 
@@ -82,12 +88,12 @@ function decodeString(view, start, end) {
   return String.fromCharCode.apply(null, new Uint8Array(view.buffer.slice(start, end)));
 }
 
-function readSubgrids(view, header, isLittleEndian) {
+function readSubgrids(view, header, isLittleEndian, includeErrorFields) {
   var gridOffset = 176;
   var grids = [];
   for (var i = 0; i < header.nSubgrids; i++) {
     var subHeader = readGridHeader(view, gridOffset, isLittleEndian);
-    var nodes = readGridNodes(view, gridOffset, subHeader, isLittleEndian);
+    var nodes = readGridNodes(view, gridOffset, subHeader, isLittleEndian, includeErrorFields);
     var lngColumnCount = Math.round(
       1 + (subHeader.upperLongitude - subHeader.lowerLongitude) / subHeader.longitudeInterval);
     var latColumnCount = Math.round(
@@ -100,13 +106,19 @@ function readSubgrids(view, header, isLittleEndian) {
       count: subHeader.gridNodeCount,
       cvs: mapNodes(nodes)
     });
-    gridOffset += 176 + subHeader.gridNodeCount * 16;
+    var rowSize = 16;
+    if (includeErrorFields === false) {
+      rowSize = 8;
+    }
+    gridOffset += 176 + subHeader.gridNodeCount * rowSize;
   }
   return grids;
 }
 
 function mapNodes(nodes) {
-  return nodes.map(function (r) {return [secondsToRadians(r.longitudeShift), secondsToRadians(r.latitudeShift)];});
+  return nodes.map(function (r) {
+    return [secondsToRadians(r.longitudeShift), secondsToRadians(r.latitudeShift)];
+  });
 }
 
 function readGridHeader(view, offset, isLittleEndian) {
@@ -123,17 +135,27 @@ function readGridHeader(view, offset, isLittleEndian) {
   };
 }
 
-function readGridNodes(view, offset, gridHeader, isLittleEndian) {
+function readGridNodes(view, offset, gridHeader, isLittleEndian, includeErrorFields) {
   var nodesOffset = offset + 176;
   var gridRecordLength = 16;
+
+  if (includeErrorFields === false) {
+    gridRecordLength = 8;
+  }
+
   var gridShiftRecords = [];
   for (var i = 0; i < gridHeader.gridNodeCount; i++) {
     var record = {
       latitudeShift: view.getFloat32(nodesOffset + i * gridRecordLength, isLittleEndian),
-      longitudeShift: view.getFloat32(nodesOffset + i * gridRecordLength + 4, isLittleEndian),
-      latitudeAccuracy: view.getFloat32(nodesOffset + i * gridRecordLength + 8, isLittleEndian),
-      longitudeAccuracy: view.getFloat32(nodesOffset + i * gridRecordLength + 12, isLittleEndian),
+      longitudeShift: view.getFloat32(nodesOffset + i * gridRecordLength + 4, isLittleEndian)
+
     };
+
+    if (includeErrorFields !== false) {
+      record.latitudeAccuracy = view.getFloat32(nodesOffset + i * gridRecordLength + 8, isLittleEndian);
+      record.longitudeAccuracy = view.getFloat32(nodesOffset + i * gridRecordLength + 12, isLittleEndian);
+    }
+
     gridShiftRecords.push(record);
   }
   return gridShiftRecords;

package/lib/parseCode.js

@@ -2,17 +2,14 @@ import defs from './defs';
 import wkt from 'wkt-parser';
 import projStr from './projString';
 import match from './match';
-function testObj(code){
+function testObj(code) {
   return typeof code === 'string';
 }
-function testDef(code){
+function testDef(code) {
   return code in defs;
 }
-var codeWords = ['PROJECTEDCRS', 'PROJCRS', 'GEOGCS','GEOCCS','PROJCS','LOCAL_CS', 'GEODCRS', 'GEODETICCRS', 'GEODETICDATUM', 'ENGCRS', 'ENGINEERINGCRS'];
-function testWKT(code){
-  return codeWords.some(function (word) {
-    return code.indexOf(word) > -1;
-  });
+function testWKT(code) {
+  return (code.indexOf('+') !== 0 && code.indexOf('[') !== -1) || (typeof code === 'object' && !('srsCode' in code));
 }
 var codes = ['3857', '900913', '3785', '102113'];
 function checkMercator(item) {
@@ -30,12 +27,12 @@ function checkProjStr(item) {
   }
   return match(ext, 'proj4');
 }
-function testProj(code){
+function testProj(code) {
   return code[0] === '+';
 }
-function parse(code){
+function parse(code) {
   if (testObj(code)) {
-    //check to see if this is a WKT string
+    // check to see if this is a WKT string
     if (testDef(code)) {
       return defs[code];
     }
@@ -54,7 +51,9 @@ function parse(code){
     if (testProj(code)) {
       return projStr(code);
     }
-  }else{
+  } else if (!code.projName) {
+    return wkt(code);
+  } else {
     return code;
   }
 }