leaflet-js 0.6.beta4 → 0.7.0

data/lib/leaflet/Jakefile.js

@@ -14,13 +14,33 @@ For a custom build, open build/build.html in the browser and follow the instruct
 
 var build = require('./build/build.js');
 
+function hint(msg, paths) {
+	return function () {
+		console.log(msg);
+		jake.exec('node node_modules/jshint/bin/jshint -c ' + paths,
+				{printStdout: true}, function () {
+			console.log('\tCheck passed.\n');
+			complete();
+		});
+	}
+}
+
 desc('Check Leaflet source for errors with JSHint');
-task('lint', build.lint);
+task('lint', {async: true}, hint('Checking for JS errors...', 'build/hintrc.js src'));
+
+desc('Check Leaflet specs source for errors with JSHint');
+task('lintspec', {async: true}, hint('Checking for specs JS errors...', 'spec/spec.hintrc.js spec/suites'));
 
 desc('Combine and compress Leaflet source files');
-task('build', ['lint'], build.build);
+task('build', build.build);
 
 desc('Run PhantomJS tests');
-task('test', ['lint'], build.test);
+task('test', ['lint', 'lintspec'], {async: true}, function () {
+	build.test(complete);
+});
+
+task('default', ['test', 'build']);
 
-task('default', ['build']);
+jake.addListener('complete', function () {
+  process.exit();
+});

data/lib/leaflet/PLUGIN-GUIDE.md

@@ -0,0 +1,127 @@
+# Leaflet Plugin Authoring Guide
+
+One of the greatest things about Leaflet is its powerful plugin ecosystem.
+The [Leaflet plugins page](http://leafletjs.com/plugins.html) lists dozens of awesome plugins, and more are being added every week.
+
+This guide lists a number of best practices for publishing a Leaflet plugin that meets the quality standards of Leaflet itself.
+
+1. [Presentation](#presentation)
+	- [Repository](#repository)
+	- [Name](#name)
+	- [Demo](#demo)
+	- [Readme](#readme)
+	- [License](#license)
+2. [Code](#code)
+	- [File Structure](#file-structure)
+	- [Code Conventions](#code-conventions)
+	- [Plugin API](#plugin-api)
+
+## Presentation
+
+### Repository
+
+The best place to put your Leaflet plugin to is a separate [GitHub](http://github.com) repository.
+If you create a collection of plugins for different uses,
+don't put them in one repo —
+it's usually easier to work with small, self-contained plugins in individual repositories.
+
+### Name
+
+Most existing plugins follow the convention of naming plugins (and repos) like this: `Leaflet.MyPluginName`.
+You can use other forms (e.g. "leaflet-my-plugin-name"),
+just make sure to include the word "Leaflet" in the name so that it's obvious that it's a Leaflet plugin.
+
+### Demo
+
+The most essential thing to do when publishing a plugin is to include a demo that showcases what the plugin does —
+it's usually the first thing people will look for.
+
+The easiest way to put up a demo is using [GitHub Pages](http://pages.github.com/).
+A good [starting point](https://help.github.com/articles/creating-project-pages-manually) is creating a `gh-pages` branch in your repo and adding an `index.html` page to it  —
+after pushing, it'll be published as `http://<user>.github.io/<repo>`.
+
+### Readme
+
+The next thing you need to have is a descriptive `README.md` in the root of the repo (or a link to a website with a similar content).
+At a minimum it should contain the following items:
+
+- name of the plugin
+- a simple, concise description of what it does
+- requirements
+	- Leaflet version
+	- other external dependencies (if any)
+	- browser / device compatibility
+- links to demos
+- instructions for including the plugin
+- simple usage code example
+- API reference (methods, options, events)
+
+### License
+
+Every open source repository should include a license.
+If you don't know what open source license to choose for your code,
+[MIT License](http://opensource.org/licenses/MIT) and [BSD 2-Clause License](http://opensource.org/licenses/BSD-2-Clause) are both good choices.
+You can either put it in the repo as a `LICENSE` file or just link to the license from the Readme.
+
+## Code
+
+### File Structure
+
+Keep the file structure clean and simple,
+don't pile up lots of files in one place  &mdash;
+make it easy for a new person to find their way in your repo.
+
+A barebones repo for a simple plugin would look like this:
+
+```
+my-plugin.js
+README.md
+```
+
+An example of a more sophisticated plugin file structure:
+
+```
+/src        - JS source files
+/dist       - minified plugin JS, CSS, images
+/spec       - test files
+/lib        - any external libraries/plugins if necessary
+/examples   - HTML examples of plugin usage
+README.md
+LICENSE
+package.json
+```
+
+### Code Conventions
+
+Everyone's tastes are different, but it's important to be consistent with whatever conventions you choose for your plugin.
+
+For a good starting point, check out [Airbnb JavaScript Guide](https://github.com/airbnb/javascript).
+Leaflet follows pretty much the same conventions
+except for using smart tabs (hard tabs for indentation, spaces for alignment)
+and putting a space after the `function` keyword.
+
+### Plugin API
+
+Never expose global variables in your plugin.<br>
+If you have a new class, put it directly in the `L` namespace (`L.MyPlugin`).<br>
+If you inherit one of the existing classes, make it a sub-property (`L.TileLayer.Banana`).<br>
+If you want to add new methods to existing Leaflet classes, you can do it like this: `L.Marker.include({myPlugin: …})`.
+
+Function, method and property names should be in `camelCase`.<br>
+Class names should be in `CapitalizedCamelCase`.
+
+If you have a lot of arguments in your function, consider accepting an options object instead
+(putting default values where possible so that users don't need specify all of them):
+
+```js
+// bad
+marker.myPlugin('bla', 'foo', null, {}, 5, 0);
+
+ // good
+marker.myPlugin('bla', {
+	optionOne: 'foo',
+	optionThree: 5
+});
+```
+
+And most importantly, keep it simple. Leaflet is all about *simplicity*.

data/lib/leaflet/README.md

@@ -1,21 +1,23 @@
 <img src="http://leafletjs.com/docs/images/logo.png" alt="Leaflet" />
 
-Leaflet is a modern open-source JavaScript library for **mobile-friendly interactive maps**.
-It is developed by [Vladimir Agafonkin][] with a team of dedicated [contributors][].
-Weighing just about 27 KB of gzipped JS code, it has all the [features][] most developers ever need for online maps.
+Leaflet is an open source JavaScript library for **mobile-friendly interactive maps**.
+It is developed by [Vladimir Agafonkin][] of [MapBox][] with a team of dedicated [contributors][].
+Weighing just about 30 KB of gzipped JS code, it has all the [features][] most developers ever need for online maps.
 
 Leaflet is designed with *simplicity*, *performance* and *usability* in mind.
 It works efficiently across all major desktop and mobile platforms out of the box,
 taking advantage of HTML5 and CSS3 on modern browsers while being accessible on older ones too.
-It can also be extended with many [plugins][],
+It can be extended with a huge amount of [plugins][],
 has a beautiful, easy to use and [well-documented][] API
 and a simple, readable [source code][] that is a joy to [contribute][] to.
 
-For more information, check out the [official website][].
+For more info, docs and tutorials, check out the [official website][].<br>
+For **Leaflet downloads** (including the built master version), check out the [download page][].
 
 We're happy to meet new contributors.
 If you want to **get involved** with Leaflet development, check out the [contribution guide][contribute].
-Let's make the best open-source library for maps that can possibly exist!
+Let's make the best mapping library that will ever exist,
+and push the limits of what's possible with online maps!
 
 [![Build Status](https://travis-ci.org/Leaflet/Leaflet.png?branch=master)](https://travis-ci.org/Leaflet/Leaflet)
 
@@ -28,3 +30,5 @@ Let's make the best open-source library for maps that can possibly exist!
  [hosted on GitHub]: http://github.com/Leaflet/Leaflet
  [contribute]: https://github.com/Leaflet/Leaflet/blob/master/CONTRIBUTING.md "A guide to contributing to Leaflet"
  [official website]: http://leafletjs.com
+ [download page]: http://leafletjs.com/download.html
+ [MapBox]: https://mapbox.com

data/lib/leaflet/build/build.html

@@ -86,21 +86,14 @@
 			<li><a href="http://nodejs.org/#download">Download and install Node</a></li>
 			<li>Run this in the command line:<br />
 			<pre><code>npm install -g jake
-npm install jshint
-npm install uglify-js</code></pre></li>
+npm install</code></pre></li>
 			<li>Run this command inside the Leaflet directory: <br /><input type="text" id="command2" />
 		</ol>
-		<h2>Building using Closure Compiler</h2>
-		<ol>
-			<li><a href="http://closure-compiler.googlecode.com/files/compiler-latest.zip">Download Closure Compiler</a>, extract it into <code>closure-compiler</code> directory</li>
-			<li>Run this command in the root Leaflet directory: <br /><input type="text" id="command" /></li>
-		</ol>
 	</div>
 
 	<script type="text/javascript">
 		var deplist = document.getElementById('deplist'),
-			commandInput = document.getElementById('command'),
-			commandInput2 = document.getElementById('command2');
+			commandInput = document.getElementById('command2');
 
 		document.getElementById('select-all').onclick = function() {
 			var checks = deplist.getElementsByTagName('input');
@@ -139,15 +132,7 @@ npm install uglify-js</code></pre></li>
 				}
 			}
 
-			var command = 'java -jar closure-compiler/compiler.jar ';
-			for (var src in files) {
-				command += '--js src/' + src + ' ';
-			}
-			command += '--js_output_file dist/leaflet-custom.js';
-
-			commandInput.value = command;
-
-			commandInput2.value = 'jake build[' + parseInt(compsStr, 2).toString(32) + ',custom]';
+			commandInput.value = 'jake build[' + parseInt(compsStr, 2).toString(32) + ',custom]';
 		}
 
 		function inputSelect() {
@@ -156,7 +141,6 @@ npm install uglify-js</code></pre></li>
 		};
 
 		commandInput.onclick = inputSelect;
-		commandInput2.onclick = inputSelect;
 
 		function onCheckboxChange() {
 			if (this.checked) {

data/lib/leaflet/build/build.js

@@ -2,29 +2,7 @@ var fs = require('fs'),
     jshint = require('jshint'),
     UglifyJS = require('uglify-js'),
 
-    deps = require('./deps.js').deps,
-    hintrc = require('./hintrc.js').config;
-
-function lintFiles(files) {
-
-	var errorsFound = 0,
-	    i, j, len, len2, src, errors, e;
-
-	for (i = 0, len = files.length; i < len; i++) {
-
-		jshint.JSHINT(fs.readFileSync(files[i], 'utf8'), hintrc, i ? {L: true} : null);
-		errors = jshint.JSHINT.errors;
-
-		for (j = 0, len2 = errors.length; j < len2; j++) {
-			e = errors[j];
-			console.log(files[i] + '\tline ' + e.line + '\tcol ' + e.character + '\t ' + e.reason);
-		}
-
-		errorsFound += len2;
-	}
-
-	return errorsFound;
-}
+    deps = require('./deps.js').deps;
 
 function getFiles(compsBase32) {
 	var memo = {},
@@ -44,16 +22,18 @@ function getFiles(compsBase32) {
 	for (var i in deps) {
 		if (comps) {
 			if (parseInt(comps.pop(), 2) === 1) {
-				console.log('\t* ' + i);
+				console.log(' * ' + i);
 				addFiles(deps[i].src);
 			} else {
-				console.log('\t  ' + i);
+				console.log('   ' + i);
 			}
 		} else {
 			addFiles(deps[i].src);
 		}
 	}
 
+	console.log('');
+
 	var files = [];
 
 	for (var src in memo) {
@@ -65,23 +45,6 @@ function getFiles(compsBase32) {
 
 exports.getFiles = getFiles;
 
-exports.lint = function () {
-
-	var files = getFiles();
-
-	console.log('Checking for JS errors...');
-
-	var errorsFound = lintFiles(files);
-
-	if (errorsFound > 0) {
-		console.log(errorsFound + ' error(s) found.\n');
-		fail();
-	} else {
-		console.log('\tCheck passed');
-	}
-};
-
-
 function getSizeDelta(newContent, oldContent) {
 	if (!oldContent) {
 		return 'new';
@@ -129,10 +92,10 @@ exports.build = function (compsBase32, buildName) {
 	console.log('\tUncompressed size: ' + newSrc.length + ' bytes (' + srcDelta + ')');
 
 	if (newSrc === oldSrc) {
-		console.log('\tNo changes');
+		console.log('\tNo changes\n');
 	} else {
 		fs.writeFileSync(srcPath, newSrc);
-		console.log('\tSaved to ' + srcPath);
+		console.log('\tSaved to ' + srcPath + '\n');
 	}
 
 	console.log('Compressing...');
@@ -148,19 +111,23 @@ exports.build = function (compsBase32, buildName) {
 	console.log('\tCompressed size: ' + newCompressed.length + ' bytes (' + delta + ')');
 
 	if (newCompressed === oldCompressed) {
-		console.log('\tNo changes');
+		console.log('\tNo changes\n');
 	} else {
 		fs.writeFileSync(path, newCompressed);
-		console.log('\tSaved to ' + path);
+		console.log('\tSaved to ' + path + '\n');
 	}
 };
 
-exports.test = function() {
+exports.test = function(callback) {
 	var karma = require('karma'),
 	    testConfig = {configFile : __dirname + '/../spec/karma.conf.js'};
 
 	testConfig.browsers = ['PhantomJS'];
 
+	function isArgv(optName) {
+		return process.argv.indexOf(optName) !== -1;
+	}
+
 	if (isArgv('--chrome')) {
 		testConfig.browsers.push('Chrome');
 	}
@@ -185,9 +152,12 @@ exports.test = function() {
 		testConfig.reporters = ['coverage'];
 	}
 
-	karma.server.start(testConfig);
+	console.log('Running tests...');
 
-	function isArgv(optName) {
-		return process.argv.indexOf(optName) !== -1;
-	}
+	karma.server.start(testConfig, function(exitCode) {
+		if (!exitCode) {
+			console.log('\tTests ran successfully.\n');
+		}
+		callback();
+	});
 };

data/lib/leaflet/build/deps.js

@@ -143,14 +143,15 @@ var deps = {
 	VectorsCanvas: {
 		src: ['layer/vector/canvas/Polyline.Canvas.js',
 		      'layer/vector/canvas/Polygon.Canvas.js',
-		      'layer/vector/canvas/Circle.Canvas.js'],
-		deps: ['PathCanvas', 'Polyline', 'Polygon', 'Circle'],
-		desc: 'Canvas fallback for vector layers (polygons, polylines, circles)'
+		      'layer/vector/canvas/Circle.Canvas.js',
+		      'layer/vector/canvas/CircleMarker.Canvas.js'],
+		deps: ['PathCanvas', 'Polyline', 'Polygon', 'Circle', 'CircleMarker'],
+		desc: 'Canvas fallback for vector layers (polygons, polylines, circles, circlemarkers)'
 	},
 
 	GeoJSON: {
 		src: ['layer/GeoJSON.js'],
-		deps: ['Marker', 'MultiPoly', 'FeatureGroup'],
+		deps: ['CircleMarker', 'Marker', 'MultiPoly', 'FeatureGroup'],
 		desc: 'GeoJSON layer, parses the data and adds corresponding layers above.'
 	},
 
@@ -175,11 +176,12 @@ var deps = {
 	TouchZoom: {
 		src: ['dom/DomEvent.js',
 		      'dom/DomEvent.DoubleTap.js',
-		      'dom/DomEvent.MsTouch.js',
+		      'dom/DomEvent.Pointer.js',
 		      'core/Handler.js',
-		      'map/handler/Map.TouchZoom.js'],
+		      'map/handler/Map.TouchZoom.js',
+		      'map/handler/Map.Tap.js'],
 		deps: ['AnimationZoom'],
-		desc: 'Enables smooth touch zooming on iOS and IE10 and double tap on iOS/IE10/Android.'
+		desc: 'Enables smooth touch zoom / tap / longhold / doubletap on iOS, IE10, Android.'
 	},
 
 	BoxZoom: {
@@ -229,6 +231,7 @@ var deps = {
 			'dom/PosAnimation.js',
 			'map/anim/Map.PanAnimation.js'
 			],
+		heading: 'Animation',
 		desc: 'Core panning animation support.'
 	},
 

data/lib/leaflet/build/hintrc.js

@@ -1,9 +1,11 @@
-exports.config = {
-
+{
 	// environment
 	"browser": true,
 	"node": true,
-	"predef": ['define'],
+	"globals": {
+		"L": true,
+		"define": true
+	},
 	"strict": false,
 
 	// code style
@@ -34,4 +36,4 @@ exports.config = {
 	// "maxcomplexity": 5
 	// "maxparams": 4,
 	// "maxdepth": 4
-};
+}

data/lib/leaflet/debug/hacks/jitter.html

@@ -4,7 +4,6 @@
 	<title>Leaflet debug page</title>
 
 	<link rel="stylesheet" href="../../dist/leaflet.css" />
-	<!--[if lte IE 8]><link rel="stylesheet" href="../../dist/leaflet.ie.css" /><![endif]-->
 
 	<meta name="viewport" content="width=device-width,initial-scale=1 maximum-scale=1.0 user-scalable=0">
 	<link rel="stylesheet" href="../css/screen.css" />