update meteor 1.5.2, new method K.Util.tmpl

.meteor/release

@@ -1 +1 @@
-METEOR@1.5.1
+METEOR@1.5.2.1

.meteor/versions

@@ -1,32 +1,32 @@
-accounts-base@1.3.1
+accounts-base@1.3.3
 accounts-facebook@1.2.1
 accounts-google@1.2.0
 accounts-oauth@1.1.15
 accounts-password@1.4.0
 allow-deny@1.0.9
 anti:i18n@0.4.3
 autoupdate@1.3.12
-babel-compiler@6.19.4
+babel-compiler@6.20.0
 babel-runtime@1.0.1
 base64@1.0.10
 binary-heap@1.0.10
 blaze@2.3.2
 blaze-html-templates@1.1.2
 blaze-tools@1.0.10
-boilerplate-generator@1.1.1
+boilerplate-generator@1.2.0
 caching-compiler@1.1.9
 caching-html-compiler@1.1.2
 callback-hook@1.0.10
 check@1.2.5
-ddp@1.3.0
-ddp-client@2.0.0
+ddp@1.3.1
+ddp-client@2.1.3
 ddp-common@1.2.9
 ddp-rate-limiter@1.0.7
-ddp-server@2.0.0
+ddp-server@2.0.2
 deps@1.0.12
 diff-sequence@1.0.7
-dynamic-import@0.1.1
-ecmascript@0.8.2
+dynamic-import@0.1.3
+ecmascript@0.8.3
 ecmascript-runtime@0.4.1
 ecmascript-runtime-client@0.4.3
 ecmascript-runtime-server@0.4.1
@@ -81,11 +81,12 @@ matb33:collection-hooks@0.8.4
 meteor@1.7.2
 meteor-base@1.1.0
 minifier-css@1.2.16
-minifier-js@2.1.1
-minimongo@1.2.1
-modules@0.9.4
+minifier-js@2.1.4
+minimongo@1.3.2
+modules@0.10.0
 modules-runtime@0.8.0
-mongo@1.1.22
+mongo@1.2.2
+mongo-dev-server@1.0.1
 mongo-id@1.0.6
 mrt:imagemagick@0.1.2
 mrt:modernizr-meteor@2.6.2
@@ -99,7 +100,7 @@ oauth1@1.1.11
 oauth2@1.1.11
 observe-sequence@1.0.16
 ordered-dict@1.0.9
-promise@0.8.9
+promise@0.9.0
 random@1.0.10
 rate-limit@1.0.8
 reactive-dict@1.1.9
@@ -116,7 +117,7 @@ spacebars@1.0.15
 spacebars-compiler@1.1.3
 srp@1.0.10
 standard-minifier-css@1.3.5
-standard-minifier-js@2.1.1
+standard-minifier-js@2.1.2
 stylus@2.513.9
 templating@1.3.2
 templating-compiler@1.3.3
@@ -129,6 +130,6 @@ underscore@1.0.10
 underscorestring:underscore.string@3.3.4
 url@1.1.0
 verron:autosize@3.0.8
-webapp@1.3.17
+webapp@1.3.19
 webapp-hashing@1.0.9
 zenorocha:clipboard@1.7.1

packages/keplerjs-core/modules/Util.js

@@ -17,6 +17,31 @@ Kepler.Util = {
 			return obj[last];
 	},
 
+	/**
+	 * [tmpl description]
+	 * @param  {String} str  [description]
+	 * @param  {Object} data [description]
+	 * @return {String}      [description]
+	 */
+	tmpl: function(str, data) {
+		/*
+		origin Leflet.js
+		 */
+		var templateRe = /\{ *([\w_\-]+) *\}/g;
+
+		return str.replace(templateRe, function (str, key) {
+			var value = data[key];
+
+			if (value === undefined) {
+				throw new Error('No value provided for variable ' + str);
+
+			} else if (typeof value === 'function') {
+				value = value(data);
+			}
+			return value;
+		});	
+	},
+
 	dateUtcToLocal: function(date) {
 		var newDate = new Date(date.getTime()+date.getTimezoneOffset()*60*1000),
 			offset = date.getTimezoneOffset() / 60,

packages/keplerjs-lib/config/underscore.js

@@ -1,8 +1,4 @@
 
-_.templateSettings = {
-	interpolate: /\{(.+?)\}/g
-};
-
 //bind underscore string
 _.str = s;
 

packages/keplerjs-lib/package.js

@@ -66,7 +66,6 @@ Package.onUse(function(api) {
     'accounts-google',
     //'accounts-twitter',
 
-
 	'blaze-html-templates@1.1.2',
     'matb33:collection-hooks@0.8.4',
     'underscorestring:underscore.string@3.3.4',

packages/keplerjs-osm/server/Osm.js

@@ -50,7 +50,7 @@ Kepler.Osm = {
 
 			queryTmpl = queryTmplId;
 
-			tags = _.template(queryTmpl, {
+			tags = K.Util.tmpl(queryTmpl, {
 				id: opts.id,
 				type: opts.type
 			});
@@ -76,7 +76,7 @@ Kepler.Osm = {
 
 				tags += '(';
 				for(var f in opts.filter) {
-					tags += _.template(queryTmpl, {
+					tags += K.Util.tmpl(queryTmpl, {
 
 						bbox: bbox,
 
@@ -92,7 +92,7 @@ Kepler.Osm = {
 
 			}else{
 
-				tags = _.template(queryTmpl, {
+				tags = K.Util.tmpl(queryTmpl, {
 
 					bbox: bbox,
 
@@ -106,7 +106,7 @@ Kepler.Osm = {
 			}		
 		}	
 
-		foot = _.template('out{meta} {limit};', {
+		foot = K.Util.tmpl('out{meta} {limit};', {
 			meta: opts.meta ? ' meta' : '',
 			limit: opts.limit
 		});

packages/keplerjs-share/client/views/panels.js

@@ -10,10 +10,10 @@ Template.panelPlace_share.helpers({
 		};
 
 		return {
-			google: _.template("http://maps.google.com/maps?ll={lat},{lon}&spn=0.5,0.5&t=h&q={lat},{lon}", loc),
-			apple: _.template("http://maps.apple.com/?ll={lat},{lon}", loc),
-			osm: _.template("http://osm.org/?mlat={lat}&mlon={lon}#map={zoom}/{lat}/{lon}", loc),
-			//TODO bing: _.template("http://maps.live.com/default.aspx?v=2&cp={lat}~{lon}&style=h", loc),
+			google: K.Util.tmpl("http://maps.google.com/maps?ll={lat},{lon}&spn=0.5,0.5&t=h&q={lat},{lon}", loc),
+			apple: K.Util.tmpl("http://maps.apple.com/?ll={lat},{lon}", loc),
+			osm: K.Util.tmpl("http://osm.org/?mlat={lat}&mlon={lon}#map={zoom}/{lat}/{lon}", loc),
+			//TODO bing: K.Util.tmpl("http://maps.live.com/default.aspx?v=2&cp={lat}~{lon}&style=h", loc),
 		};
 
 	}

packages/keplerjs-ui/client/views/panels/settings.js

@@ -31,7 +31,7 @@ Template.panelSettings.helpers({
 				val: k,
 				name: i18n('map_layer_'+k),
 				active: k===layer,
-				url: _.template(val,{s:'a',z:'15',x:'17374',y:'11667'})
+				url: K.Util.tmpl(val,{s:'a',z:'15',x:'17374',y:'11667'})
 			};
 		});
 	},

packages/keplerjs-upload/server/upload.js

@@ -45,7 +45,7 @@ Meteor.methods({
 			},
 			fileUid = Meteor.user().username +'_'+ K.Util.time(),
 			fileName = K.Util.sanitize.filename( fileUid ),
-			fileMin = fileName + _.template('_{width}x{height}.min.jpg', imgSize),
+			fileMin = fileName + K.Util.tmpl('_{width}x{height}.min.jpg', imgSize),
 			fileBig = fileName + '.ori.jpg',
 			imgOpts = _.extend(imgSize, {
 				srcPath: filePath + fileBig,