Merge pull request #41 from calvinmetcalf/proj-strings (caaf763c) · Commits · REDMIC Project / Third party / Proj4js

bower.json

+1 −1

Original line number	Diff line number	Diff line
		{
		"name": "proj4js",
		"version": "1.3.1",
		"version": "1.3.2",
		"homepage": "https://github.com/proj4js/proj4js",
		"description": "Proj4js is a JavaScript library to transform point coordinates from one coordinate system to another, including datum transformations.",
		"main": "dist/proj4.js",

package.json

+1 −1

Original line number	Diff line number	Diff line
		{
		"name": "proj4js",
		"version": "1.3.1",
		"version": "1.3.2",
		"description": "Proj4js is a JavaScript library to transform point coordinates from one coordinate system to another, including datum transformations.",
		"main": "./dist/proj4.js",
		"directories": {

src/Proj.js

+5 −1

Original line number	Diff line number	Diff line
		define(['./extend','./common','./defs','./constants','./datum','./projections','./wkt'],function(extend, common, defs,constants,datum,projections,wkt) {
		define(['./extend','./common','./defs','./constants','./datum','./projections','./wkt','./projString'],function(extend, common, defs,constants,datum,projections,wkt,projStr) {

		var proj = function proj(srsCode) {
		if (!(this instanceof proj)) {
		@@ -16,6 +16,10 @@ define(['./extend','./common','./defs','./constants','./datum','./projections','
		this.deriveConstants(obj);
		extend(this,obj);
		//this.loadProjCode(this.projName);
		}else if(srsCode[0]==='+'){
		obj = projStr(srsCode);
		this.deriveConstants(obj);
		extend(this,obj);
		}
		} else {
		this.deriveConstants(srsCode);

src/defs.js

+6 −117

Original line number	Diff line number	Diff line
		define(['./common','./constants','./global'],function(common, constants,globals) {
		define(['./common','./constants','./global','./projString'],function(common, constants,globals,parseProj) {

		function defs(name) {
		/global console/
		var defData, that = this;
		var that = this;
		if (arguments.length === 2) {
		defData = arguments[1];
		defs[name] = parseProj(arguments[1]);
		}
		else if (arguments.length === 1) {
		if (Array.isArray(name)) {
		@@ -34,120 +34,9 @@ define(['./common','./constants','./global'],function(common, constants,globals)
		}
		return;
		}
		var self = {};
		var nameSplit;
		if (name.indexOf(":") > -1) {
		nameSplit = name.split(":");
		self[nameSplit[0]] = nameSplit[1];
		}
		var paramObj = {};
		defData.split("+").map(function(v) {
		return v.trim();
		}).filter(function(a) {
		return a;
		}).forEach(function(a) {
		var split = a.split("=");
		if (split[1] === "@null") {
		return;
		}
		split.push(true);
		paramObj[split[0].toLowerCase()] = split[1];
		});
		var paramName, paramVal, paramOutname;
		var params = {
		proj: 'projName',
		datum: 'datumCode',
		rf: function(v) {
		self.rf = parseFloat(v, 10);
		},
		lat_0: function(v) {
		self.lat0 = v * common.D2R;
		},
		lat_1: function(v) {
		self.lat1 = v * common.D2R;
		},
		lat_2: function(v) {
		self.lat2 = v * common.D2R;
		},
		lat_ts: function(v) {
		self.lat_ts = v * common.D2R;
		},
		lon_0: function(v) {
		self.long0 = v * common.D2R;
		},
		lon_1: function(v) {
		self.long1 = v * common.D2R;
		},
		lon_2: function(v) {
		self.long2 = v * common.D2R;
		},
		alpha: function(v) {
		self.alpha = parseFloat(v) * common.D2R;
		},
		lonc: function(v) {
		self.longc = v * common.D2R;
		},
		x_0: function(v) {
		self.x0 = parseFloat(v, 10);
		},
		y_0: function(v) {
		self.y0 = parseFloat(v, 10);
		},
		k_0: function(v) {
		self.k0 = parseFloat(v, 10);
		},
		k: function(v) {
		self.k0 = parseFloat(v, 10);
		},
		r_a: function() {
		self.R_A = true;
		},
		zone: function(v) {
		self.zone = parseInt(v, 10);
		},
		south: function() {
		self.utmSouth = true;
		},
		towgs84: function(v) {
		self.datum_params = v.split(",").map(function(a) {
		return parseFloat(a, 10);
		});
		},
		to_meter: function(v) {
		self.to_meter = parseFloat(v, 10);
		},
		from_greenwich: function(v) {
		self.from_greenwich = v * common.D2R;
		},
		pm: function(v) {
		self.from_greenwich = (constants.PrimeMeridian[v] ? constants.PrimeMeridian[v] : parseFloat(v, 10)) * common.D2R;
		},
		axis: function(v) {
		var legalAxis = "ewnsud";
		if (v.length === 3 && legalAxis.indexOf(v.substr(0, 1)) !== -1 && legalAxis.indexOf(v.substr(1, 1)) !== -1 && legalAxis.indexOf(v.substr(2, 1)) !== -1) {
		self.axis = v;
		}
		}
		};
		for (paramName in paramObj) {
		paramVal = paramObj[paramName];
		if (paramName in params) {
		paramOutname = params[paramName];
		if (typeof paramOutname === 'function') {
		paramOutname(paramVal);
		}
		else {
		self[paramOutname] = paramVal;
		}
		}
		else {
		self[paramName] = paramVal;
		}
		}
		defs[name] = self;
		return name;


		}
		globals(defs);
		return defs;

		});

src/projString.js

0 → 100644

+111 −0

Original line number	Diff line number	Diff line
		define(['./common', './constants'], function(common, constants) {
		return function(defData) {
		var self = {};

		var paramObj = {};
		defData.split("+").map(function(v) {
		return v.trim();
		}).filter(function(a) {
		return a;
		}).forEach(function(a) {
		var split = a.split("=");
		if (split[1] === "@null") {
		return;
		}
		split.push(true);
		paramObj[split[0].toLowerCase()] = split[1];
		});
		var paramName, paramVal, paramOutname;
		var params = {
		proj: 'projName',
		datum: 'datumCode',
		rf: function(v) {
		self.rf = parseFloat(v, 10);
		},
		lat_0: function(v) {
		self.lat0 = v * common.D2R;
		},
		lat_1: function(v) {
		self.lat1 = v * common.D2R;
		},
		lat_2: function(v) {
		self.lat2 = v * common.D2R;
		},
		lat_ts: function(v) {
		self.lat_ts = v * common.D2R;
		},
		lon_0: function(v) {
		self.long0 = v * common.D2R;
		},
		lon_1: function(v) {
		self.long1 = v * common.D2R;
		},
		lon_2: function(v) {
		self.long2 = v * common.D2R;
		},
		alpha: function(v) {
		self.alpha = parseFloat(v) * common.D2R;
		},
		lonc: function(v) {
		self.longc = v * common.D2R;
		},
		x_0: function(v) {
		self.x0 = parseFloat(v, 10);
		},
		y_0: function(v) {
		self.y0 = parseFloat(v, 10);
		},
		k_0: function(v) {
		self.k0 = parseFloat(v, 10);
		},
		k: function(v) {
		self.k0 = parseFloat(v, 10);
		},
		r_a: function() {
		self.R_A = true;
		},
		zone: function(v) {
		self.zone = parseInt(v, 10);
		},
		south: function() {
		self.utmSouth = true;
		},
		towgs84: function(v) {
		self.datum_params = v.split(",").map(function(a) {
		return parseFloat(a, 10);
		});
		},
		to_meter: function(v) {
		self.to_meter = parseFloat(v, 10);
		},
		from_greenwich: function(v) {
		self.from_greenwich = v * common.D2R;
		},
		pm: function(v) {
		self.from_greenwich = (constants.PrimeMeridian[v] ? constants.PrimeMeridian[v] : parseFloat(v, 10)) * common.D2R;
		},
		axis: function(v) {
		var legalAxis = "ewnsud";
		if (v.length === 3 && legalAxis.indexOf(v.substr(0, 1)) !== -1 && legalAxis.indexOf(v.substr(1, 1)) !== -1 && legalAxis.indexOf(v.substr(2, 1)) !== -1) {
		self.axis = v;
		}
		}
		};
		for (paramName in paramObj) {
		paramVal = paramObj[paramName];
		if (paramName in params) {
		paramOutname = params[paramName];
		if (typeof paramOutname === 'function') {
		paramOutname(paramVal);
		}
		else {
		self[paramOutname] = paramVal;
		}
		}
		else {
		self[paramName] = paramVal;
		}
		}
		return self;
		};
		});
		No newline at end of file