Commit 62ec217e authored by Michael Adair's avatar Michael Adair
Browse files

closes #29: don't use extend to set failed defData and chek that defsData exists when parsing

parent 553d2f9f
Loading
Loading
Loading
Loading
+4 −1
Original line number Diff line number Diff line
@@ -558,7 +558,7 @@ Proj4js.Proj = Proj4js.Class({
 */
   defsFailed: function() {
      Proj4js.reportError('failed to load projection definition for: '+this.srsCode);
      Proj4js.extend(Proj4js.defs[this.srsCode], Proj4js.defs['WGS84']);  //set it to something so it can at least continue
      Proj4js.defs[this.srsCode] = Proj4js.defs['WGS84'];  //set it to something so it can at least continue
      this.defsLoaded();
    },

@@ -639,6 +639,9 @@ Proj4js.Proj = Proj4js.Class({
  parseDefs: function() {
      this.defData = Proj4js.defs[this.srsCode];
      var paramName, paramVal;
      if (!this.defData) {
        return;
      }
      var paramArray=this.defData.split("+");

      for (var prop=0; prop<paramArray.length; prop++) {