re #69: fix errors reported by the closure compiler (aa1f628a) · Commits · REDMIC Project / Third party / Proj4js

build/build.py

+86 −23

Original line number	Diff line number	Diff line
		@@ -2,30 +2,80 @@

		import sys
		sys.path.append("../tools")
		import mergejs
		import optparse

		import jsmin, mergejs
		def build(config_file = None, output_file = None, options = None):
		have_compressor = []
		try:
		import jsmin
		have_compressor.append("jsmin")
		except ImportError:
		print "No jsmin"
		try:
		import closure
		have_compressor.append("closure")
		except Exception, E:
		print "No closure (%s)" % E
		try:
		import closure_ws
		have_compressor.append("closure_ws")
		except ImportError:
		print "No closure_ws"

		try:
		import minimize
		have_compressor.append("minimize")
		except ImportError:
		print "No minimize"

		use_compressor = None
		if options.compressor and options.compressor in have_compressor:
		use_compressor = options.compressor

		sourceDirectory = "../lib"
		configFilename = "library.cfg"
		filename = "proj4js-compressed.js"
		outputFilename = "../lib/" + filename

		if len(sys.argv) > 1:
		configFilename = sys.argv[1]
		if config_file:
		configFilename = config_file
		extension = configFilename[-4:]

		if extension != ".cfg":
		configFilename = sys.argv[1] + ".cfg"
		configFilename = config_file + ".cfg"

		if len(sys.argv) > 2:
		outputFilename = sys.argv[2]
		if output_file:
		outputFilename = output_file

		print "Merging libraries."
		merged = mergejs.run(sourceDirectory, None, configFilename)
		print "Setting the filename to "+filename
		merged = merged.replace('scriptName: "proj4js.js",','scriptName: "'+filename+'",');
		print "Compressing."
		print "Compressing using %s" % use_compressor
		if use_compressor == "jsmin":
		minimized = jsmin.jsmin(merged)
		elif use_compressor == "minimize":
		minimized = minimize.minimize(merged)
		elif use_compressor == "closure_ws":
		if len(merged) > 1000000: # The maximum file size for this web service is 1000 KB.
		print "\nPre-compressing using jsmin"
		merged = jsmin.jsmin(merged)
		print "\nIs being compressed using Closure Compiler Service."
		try:
		minimized = closure_ws.minimize(merged)
		except Exception, E:
		print "\nAbnormal termination."
		sys.exit("ERROR: Closure Compilation using Web service failed!\n%s" % E)
		if len(minimized) <= 2:
		print "\nAbnormal termination due to compilation errors."
		sys.exit("ERROR: Closure Compilation using Web service failed!")
		else:
		print '\nClosure Compilation using Web service has completed successfully.'
		elif use_compressor == "closure":
		minimized = closure.minimize(merged)
		else: # fallback
		minimized = merged
		print "Adding license file."
		minimized = file("license.txt").read() + minimized

		@@ -33,3 +83,16 @@ print "Writing to %s." % outputFilename
		file(outputFilename, "w").write(minimized)

		print "Done."

		if __name__ == '__main__':
		opt = optparse.OptionParser(usage="%s [options] [config_file] [output_file]\n Default config_file is 'full.cfg', Default output_file is 'OpenLayers.js'")
		opt.add_option("-c", "--compressor", dest="compressor", help="compression method: one of 'jsmin', 'minimize', 'closure_ws', 'closure', or 'none'", default="jsmin")
		(options, args) = opt.parse_args()
		if not len(args):
		build(options=options)
		elif len(args) == 1:
		build(args[0], options=options)
		elif len(args) == 2:
		build(args[0], args[1], options=options)
		else:
		print "Wrong number of arguments"

lib/proj4js-combined.js

+44 −21

Original line number	Diff line number	Diff line
		@@ -4,10 +4,32 @@
		Authors: Mike Adair madairATdmsolutions.ca
		Richard Greenwood richATgreenwoodmap.com
		Didier Richard didier.richardATign.fr
		Stephen Irons
		License: LGPL as per: http://www.gnu.org/copyleft/lesser.html
		Note: This program is an almost direct port of the C library
		Proj4.
		Stephen Irons stephen.ironsATclear.net.nz
		Olivier Terral oterralATgmail.com

		License:
		Copyright (c) 2012, Mike Adair, Richard Greenwood, Didier Richard,
		Stephen Irons and Olivier Terral

		Permission is hereby granted, free of charge, to any person obtaining a
		copy of this software and associated documentation files (the "Software"),
		to deal in the Software without restriction, including without limitation
		the rights to use, copy, modify, merge, publish, distribute, sublicense,
		and/or sell copies of the Software, and to permit persons to whom the
		Software is furnished to do so, subject to the following conditions:

		The above copyright notice and this permission notice shall be included
		in all copies or substantial portions of the Software.

		THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
		OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
		FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
		THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
		LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
		FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
		DEALINGS IN THE SOFTWARE.

		Note: This program is an almost direct port of the C library PROJ.4.
		*/
		/* ======================================================================
		proj4js.js
		@@ -60,7 +82,7 @@ $Id: Proj.js 2956 2007-07-09 12:17:52Z steven $
		/**
		* Global namespace object for Proj4js library
		*/
		Proj4js = {
		var Proj4js = {

		/**
		* Property: defaultDatum
		@@ -912,7 +934,7 @@ Proj4js.Proj = Proj4js.Class({
		case "k_0": this.k0 = parseFloat(paramVal); break; // projection scale factor
		case "k": this.k0 = parseFloat(paramVal); break; // both forms returned
		case "r_a": this.R_A = true; break; // sphere--area of ellipsoid
		case "zone": this.zone = parseInt(paramVal); break; // UTM Zone
		case "zone": this.zone = parseInt(paramVal,10); break; // UTM Zone
		case "south": this.utmSouth = true; break; // UTM north/south
		case "towgs84":this.datum_params = paramVal.split(","); break;
		case "to_meter": this.to_meter = parseFloat(paramVal); break; // cartesian scaling
		@@ -1241,7 +1263,7 @@ Proj4js.common = {
		var phi = arg;
		for (var i = Proj4js.common.MAX_ITER; i ; --i) { /* rarely goes over 2 iterations */
		var s = Math.sin(phi);
		t = 1. - es * s * s;
		var t = 1. - es * s * s;
		//t = this.pj_mlfn(phi, s, Math.cos(phi), en) - arg;
		//phi -= t * (t * Math.sqrt(t)) * k;
		t = (this.pj_mlfn(phi, s, Math.cos(phi), en) - arg) * (t * Math.sqrt(t)) * k;
		@@ -2552,8 +2574,8 @@ Proj4js.Proj.eqdc = {
		p.y = this.rh - p.y + this.y0;
		var con, rh1;
		if (this.ns >= 0) {
		var rh1 = Math.sqrt(p.x p.x + p.y p.y);
		var con = 1.0;
		rh1 = Math.sqrt(p.x p.x + p.y p.y);
		con = 1.0;
		} else {
		rh1 = -Math.sqrt(p.x p. x +p. y p.y);
		con = -1.0;
		@@ -3256,7 +3278,7 @@ Proj4js.Proj.stere = {
		case this.EQUIT:
		y = 1. + cosphi * coslam;
		if (y <= Proj4js.common.EPSLN) {
		F_ERROR;
		Proj4js.reportError("stere:forward:Equit");
		}
		y = this.akm1 / y;
		x = y * cosphi * sinlam;
		@@ -3265,7 +3287,7 @@ Proj4js.Proj.stere = {
		case this.OBLIQ:
		y = 1. + this.sinph0 * sinphi + this.cosph0 * cosphi * coslam;
		if (y <= Proj4js.common.EPSLN) {
		F_ERROR;
		Proj4js.reportError("stere:forward:Obliq");
		}
		y = this.akm1 / y;
		x = y * cosphi * sinlam;
		@@ -3277,7 +3299,7 @@ Proj4js.Proj.stere = {
		//Note no break here so it conitnues through S_POLE
		case this.S_POLE:
		if (Math.abs(lat - Proj4js.common.HALF_PI) < this.TOL) {
		F_ERROR;
		Proj4js.reportError("stere:forward:S_POLE");
		}
		y = this.akm1 * Math.tan(Proj4js.common.FORTPI + .5 * lat);
		x = sinlam * y;
		@@ -3352,11 +3374,11 @@ Proj4js.Proj.stere = {
		if (Math.abs(rh) <= Proj4js.common.EPSLN) {
		lat = this.phi0;
		} else {
		lat = Math.asin(cosc * sinph0 + y * sinc * cosph0 / rh);
		lat = Math.asin(cosc * this.sinph0 + y * sinc * this.cosph0 / rh);
		}
		c = cosc - sinph0 * Math.sin(lat);
		c = cosc - this.sinph0 * Math.sin(lat);
		if (c != 0. \|\| x != 0.) {
		lon = Math.atan2(x * sinc * cosph0, c * rh);
		lon = Math.atan2(x * sinc * this.cosph0, c * rh);
		}
		break;
		case this.N_POLE:
		@@ -3961,9 +3983,10 @@ Proj4js.Proj.sinu = {
		if (!this.m) {
		lat = this.n != 1. ? Math.asin(this.n * Math.sin(lat)): lat;
		} else {
		k = this.n * Math.sin(lat);
		var k = this.n * Math.sin(lat);
		for (var i = Proj4js.common.MAX_ITER; i ; --i) {
		lat -= V = (this.m * lat + Math.sin(lat) - k) / (this.m + Math.cos(lat));
		var V = (this.m * lat + Math.sin(lat) - k) / (this.m + Math.cos(lat));
		lat -= V;
		if (Math.abs(V) < Proj4js.common.EPSLN) break;
		}
		}
		@@ -3996,7 +4019,7 @@ Proj4js.Proj.sinu = {

		p.y /= this.C_y;
		lat = this.m ? Math.asin((this.m * p.y + Math.sin(p.y)) / this.n) :
		( this.n != 1. ? Math.asin(sin(p.y) / this.n) : p.y );
		( this.n != 1. ? Math.asin(Math.sin(p.y) / this.n) : p.y );
		lon = p.x / (this.C_x * (this.m + Math.cos(p.y)));

		} else {
		@@ -5085,7 +5108,7 @@ Proj4js.Proj.laea = {
		var cosz=0.0, rh, sinz=0.0;

		rh = Math.sqrt(xx + yy);
		var phi = rh * .5;
		phi = rh * .5;
		if (phi > 1.) {
		Proj4js.reportError("laea:Inv:DataError");
		return null;
		@@ -5288,7 +5311,7 @@ Proj4js.Proj.aeqd = {
		lat = Proj4js.common.asinz(cosz * this.sin_p12 + (p.y * sinz * this.cos_p12) / rh);
		var con = Math.abs(this.lat0) - Proj4js.common.HALF_PI;
		if (Math.abs(con) <= Proj4js.common.EPSLN) {
		if (lat0 >= 0.0) {
		if (this.lat0 >= 0.0) {
		lon = Proj4js.common.adjust_lon(this.long0 + Math.atan2(p.x , -p.y));
		} else {
		lon = Proj4js.common.adjust_lon(this.long0 - Math.atan2(-p.x , p.y));

lib/proj4js-compressed.js

+173 −237

File changed.

Preview size limit exceeded, changes collapsed.

lib/proj4js.js

+3 −3

Original line number	Diff line number	Diff line
		@@ -45,7 +45,7 @@ $Id: Proj.js 2956 2007-07-09 12:17:52Z steven $
		/**
		* Global namespace object for Proj4js library
		*/
		Proj4js = {
		var Proj4js = {

		/**
		* Property: defaultDatum
		@@ -897,7 +897,7 @@ Proj4js.Proj = Proj4js.Class({
		case "k_0": this.k0 = parseFloat(paramVal); break; // projection scale factor
		case "k": this.k0 = parseFloat(paramVal); break; // both forms returned
		case "r_a": this.R_A = true; break; // sphere--area of ellipsoid
		case "zone": this.zone = parseInt(paramVal); break; // UTM Zone
		case "zone": this.zone = parseInt(paramVal,10); break; // UTM Zone
		case "south": this.utmSouth = true; break; // UTM north/south
		case "towgs84":this.datum_params = paramVal.split(","); break;
		case "to_meter": this.to_meter = parseFloat(paramVal); break; // cartesian scaling
		@@ -1226,7 +1226,7 @@ Proj4js.common = {
		var phi = arg;
		for (var i = Proj4js.common.MAX_ITER; i ; --i) { /* rarely goes over 2 iterations */
		var s = Math.sin(phi);
		t = 1. - es * s * s;
		var t = 1. - es * s * s;
		//t = this.pj_mlfn(phi, s, Math.cos(phi), en) - arg;
		//phi -= t * (t * Math.sqrt(t)) * k;
		t = (this.pj_mlfn(phi, s, Math.cos(phi), en) - arg) * (t * Math.sqrt(t)) * k;

lib/projCode/aeqd.js

+1 −1

Original line number	Diff line number	Diff line
		@@ -52,7 +52,7 @@ Proj4js.Proj.aeqd = {
		lat = Proj4js.common.asinz(cosz * this.sin_p12 + (p.y * sinz * this.cos_p12) / rh);
		var con = Math.abs(this.lat0) - Proj4js.common.HALF_PI;
		if (Math.abs(con) <= Proj4js.common.EPSLN) {
		if (lat0 >= 0.0) {
		if (this.lat0 >= 0.0) {
		lon = Proj4js.common.adjust_lon(this.long0 + Math.atan2(p.x , -p.y));
		} else {
		lon = Proj4js.common.adjust_lon(this.long0 - Math.atan2(-p.x , p.y));