leaflet-js 0.7.9 → 0.8.dev2

data/{vendor/assets/Leaflet.draw → lib/leaflet.draw}/src/ext/GeometryUtil.js

@@ -29,7 +29,7 @@ L.GeometryUtil = L.extend(L.GeometryUtil || {}, {
 				areaStr = area.toFixed(2) + ' m²';
 			}
 		} else {
-			area /= 0.836127; // Square yards in 1 meter
+			area *= 0.836127; // Square yards in 1 meter
 
 			if (area >= 3097600) { //3097600 square yards in 1 square mile
 				areaStr = (area / 3097600).toFixed(2) + ' mi²';

data/lib/leaflet.label/CHANGELOG.md

@@ -0,0 +1,67 @@
+Leaflet.draw Changelog
+======================
+
+## master
+
+An in-progress version being developed on the master branch.
+
+### Plugin improvements
+
+ * Improved performance when setting label content.
+
+### Bug fixes
+
+ * Fixed issue where labels could appear blurry after zoom. 
+
+## 0.2.0 (August 20, 2013)
+
+### Plugin improvements
+
+ * Removed need to call `showLabel` when adding a static label to the map.
+ * Added support for changing the direction of the label in relation to the marker. Added auto mode that switches depending on which side of the screen you are on. (adapted from [@erictheise](https://github.com/erictheise) pull request) [#17](https://github.com/Leaflet/Leaflet.label/pull/17)
+ * Added `labelAnchor` option to `L.CircleMarker`.
+
+### Bug fixes
+
+ * Fix bug where map view hard reset did not update labels. (by [@dagjomar](https://github.com/dagjomar)). [#43](https://github.com/Leaflet/Leaflet.label/pull/43)
+ * Fix issue where non static labels would remain visible if the latlng of the marker changed.
+
+## 0.1.4 (August 20, 2013)
+
+### Bug fixes
+
+ * Fixed error in IE < 9 when trying to set the label z-index. (by [@arthur-e](https://github.com/arthur-e)). [#13](https://github.com/Leaflet/Leaflet.label/pull/25)
+ * Fixed an issue when removing the click handler from the container to close labels in touch devices.
+
+## 0.1.3 (May 02, 2013)
+
+### Plugin improvements
+
+ * Added method `L.Marker.setLabelNoHide()` to allow toggling of static marker labels. (inspired by [@kpwebb](https://github.com/kpwebb)). [#20](https://github.com/Leaflet/Leaflet.label/pull/20)
+ * Non-static labels will now hide when map container is tapped on touch devices. (by [@snkashis](https://github.com/snkashis)). [#26](https://github.com/Leaflet/Leaflet.label/pull/26)
+ * Added ability to set the opacity of the label along with the marker. (inspired by [@snkashis](https://github.com/snkashis)). [#20](https://github.com/Leaflet/Leaflet.label/pull/27)
+ * Added support for mouse event to L.Label.
+ * Added public getter to L.Marker to retrieve the label associated to a marker.
+
+### Bug fixes
+
+ * Fixed labels not updating position after being dragged. (by [@snkashis](https://github.com/snkashis)). [#13](https://github.com/Leaflet/Leaflet.label/pull/13)
+ * Z-Index fixes aimed at static labels. This will ensure that label is shown at the same level as the marker.
+ * Correctly remove event listeners in Marker.Label and Path.Label.
+
+## 0.1.1 (December 10, 2012)
+
+### Plugin improvements
+
+ * FeatureGroup now supports label methods.
+
+### Bug fixes
+
+ * Fixed bug where label wouldn't hide when unbindLabel was called.
+ * Fixed Multi-Poly support.
+ * Fixed bug where a label's position wouldn't be updated when a marker moved.
+ * Fixed bug where label wouldn't be removed from map when a marker was. 
+
+## 0.1.0 (October 7, 2012)
+
+Initial version of Leaflet.label

data/lib/leaflet.label/Jakefile.js

@@ -0,0 +1,21 @@
+/*
+Leaflet.label building and linting scripts.
+
+To use, install Node, then run the following commands in the project root:
+
+    npm install -g jake
+    npm install uglify-js
+    npm install jshint
+
+To check the code and build Leaflet.label from source, run "jake"
+*/
+
+var build = require('./build/build.js');
+
+desc('Check Leaflet.label source for errors with JSHint');
+task('lint', build.lint);
+
+desc('Combine and compress Leaflet.label source files');
+task('build', ['lint'], build.build);
+
+task('default', ['build']);

data/lib/leaflet.label/MIT-LICENCE.txt

@@ -0,0 +1,20 @@
+Copyright 2012 Jacob Toye
+
+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.

data/lib/leaflet.label/README.md

@@ -0,0 +1,103 @@
+Leaflet.label
+=============
+
+**NOTE: lastest Leaflet.label master requires Leaflet 0.7-dev**
+
+Leaflet.label is plugin for adding labels to markers & shapes on leaflet powered maps.
+
+Check out the [demo](http://leaflet.github.com/Leaflet.label/).
+
+##Usage examples
+
+If you want to just bind a label to marker that will show when the mouse is over it, it's really easy:
+
+````js
+L.marker([-37.7772, 175.2606]).bindLabel('Look revealing label!').addTo(map);
+````
+
+Path overlays works the same:
+
+````js
+L.polyline([
+	[-37.7612, 175.2756],
+	[-37.7702, 175.2796],
+	[-37.7802, 175.2750],
+]).bindLabel('Even polylines can have labels.').addTo(map)	
+````
+
+If you would prefer the label to be always visible set the ````noHide: true```` option and call ````showLabel()```` once added to the map:
+
+````js
+L.marker([-37.785, 175.263])
+	.bindLabel('A sweet static label!', { noHide: true })
+	.addTo(map);
+````
+
+##Options
+
+When you call ````bindLabel()```` you can pass in an options object. These options are:
+
+ - **noHide**: doesn't attach event handler for showing/hiding the label on mouseover/out.
+ - **className**: the css class to add to the label element
+ - **direction**: one of `left`|`right`(default)|`auto`. The direction the label displays in relation to the marker. `auto` will choose the optimal direction depending on the position of the marker.
+
+E.g. To create a static label that automatically positions the label
+
+````js
+var myIcon = L.icon({
+	iconUrl: 'my-icon.png',
+	iconSize: [20, 20],
+	iconAnchor: [10, 10],
+	labelAnchor: [6, 0] // as I want the label to appear 2px past the icon (10 + 2 - 6)
+});
+L.marker([-37.7772, 175.2606], {
+	icon: myIcon
+}).bindLabel('My label', {
+	noHide: true,
+	direction: 'auto'
+});
+````
+
+##Positioning the label for custom icons
+
+The label is positioned relative to the L.Icon's ````iconAnchor```` option. To reposition the label set the ````labelAnchor```` option of your icon. By default ````labelAnchor```` is set so the label will show vertically centered for the default icon (````L.Icon.Default````).
+
+E.g. Vertically center an icon with ````iconAnchor```` set as the center of the icon:
+
+````js
+var myIcon = L.icon({
+	iconUrl: 'my-icon.png',
+	iconSize: [20, 20],
+	iconAnchor: [10, 10],
+	labelAnchor: [6, 0] // as I want the label to appear 2px past the icon (10 + 2 - 6)
+});
+L.marker([-37.7772, 175.2606], {
+	icon: myIcon
+}).bindLabel('Look revealing label!').addTo(map);
+````
+
+When positioning the label L.Label includes a 6px horizontal padding. you will need to take this into account when setting ````labelAnchor````.
+
+##Setting the opacity of a label
+
+You can set the opacity of a label by calling the `setOpacity` method on `L.Marker`. By default the opacity will either be **0** or **1**. 
+
+````js
+// Sets opacity of marker to 0.3 and opacity of label to 1
+markerLabel.setOpacity(0.3);
+
+// Sets opacity of marker to 0.3 and opacity of label to 0.3
+markerLabel.setOpacity(0.3, true);
+
+// Sets opacity of marker to 0 and opacity of label to 0
+markerLabel.setOpacity(0);
+markerLabel.setOpacity(0, true);
+
+// Sets opacity of marker to 1 and opacity of label to 1
+markerLabel.setOpacity(1);
+markerLabel.setOpacity(1, true);
+````
+
+##Alternative label plugin
+
+My previous label plugin is still available at https://github.com/jacobtoye/Leaflet.iconlabel. This plugin is a little harder to use, however if you want to have both the icon and label bound to the same event this plugin is for you.

data/lib/leaflet.label/build/build.js

@@ -0,0 +1,155 @@
+var fs = require('fs'),
+    jshint = require('jshint'),
+    UglifyJS = require('uglify-js'),
+
+    deps = require('./deps.js').deps,
+    hintrc = require('./hintrc.js');
+
+
+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.config, hintrc.globals);
+		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;
+}
+
+function getFiles(compsBase32) {
+	var memo = {},
+	    comps;
+
+	if (compsBase32) {
+		comps = parseInt(compsBase32, 32).toString(2).split('');
+		console.log('Managing dependencies...');
+	}
+
+	function addFiles(srcs) {
+		for (var j = 0, len = srcs.length; j < len; j++) {
+			memo[srcs[j]] = true;
+		}
+	}
+
+	for (var i in deps) {
+		if (comps) {
+			if (parseInt(comps.pop(), 2) === 1) {
+				console.log('\t* ' + i);
+				addFiles(deps[i].src);
+			} else {
+				console.log('\t  ' + i);
+			}
+		} else {
+			addFiles(deps[i].src);
+		}
+	}
+
+	var files = [];
+
+	for (var src in memo) {
+		files.push('src/' + src);
+	}
+
+	return files;
+}
+
+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';
+	}
+	var newLen = newContent.replace(/\r\n?/g, '\n').length,
+		oldLen = oldContent.replace(/\r\n?/g, '\n').length,
+		delta = newLen - oldLen;
+
+	return (delta >= 0 ? '+' : '') + delta;
+}
+
+function loadSilently(path) {
+	try {
+		return fs.readFileSync(path, 'utf8');
+	} catch (e) {
+		return null;
+	}
+}
+
+function combineFiles(files) {
+	var content = '';
+	for (var i = 0, len = files.length; i < len; i++) {
+		content += fs.readFileSync(files[i], 'utf8') + '\n\n';
+	}
+	return content;
+}
+
+exports.build = function (compsBase32, buildName) {
+
+	var files = getFiles(compsBase32);
+
+	console.log('Concatenating ' + files.length + ' files...');
+
+	var copy = fs.readFileSync('src/copyright.js', 'utf8'),
+	    intro = '(function (window, document, undefined) {\n',
+	    outro = '}(this, document));',
+	    newSrc = copy + intro + combineFiles(files) + outro,
+
+	    pathPart = 'dist/leaflet.label' + (buildName ? '-' + buildName : ''),
+	    srcPath = pathPart + '-src.js',
+
+	    oldSrc = loadSilently(srcPath),
+	    srcDelta = getSizeDelta(newSrc, oldSrc);
+
+	console.log('\tUncompressed size: ' + newSrc.length + ' bytes (' + srcDelta + ')');
+
+	if (newSrc === oldSrc) {
+		console.log('\tNo changes');
+	} else {
+		fs.writeFileSync(srcPath, newSrc);
+		console.log('\tSaved to ' + srcPath);
+	}
+
+	console.log('Compressing...');
+
+	var path = pathPart + '.js',
+	    oldCompressed = loadSilently(path),
+	    newCompressed = copy + UglifyJS.minify(newSrc, {
+	        warnings: true,
+	        fromString: true
+	    }).code,
+	    delta = getSizeDelta(newCompressed, oldCompressed);
+
+	console.log('\tCompressed size: ' + newCompressed.length + ' bytes (' + delta + ')');
+
+	if (newCompressed === oldCompressed) {
+		console.log('\tNo changes');
+	} else {
+		fs.writeFileSync(path, newCompressed);
+		console.log('\tSaved to ' + path);
+	}
+};

data/lib/leaflet.label/build/deps.js

@@ -0,0 +1,26 @@
+var deps = {
+	Core: {
+		src: [
+			'Leaflet.label.js'
+		],
+		desc: 'The core of the plugin. Currently only includes the version.'
+	},
+
+	Label: {
+		src: [
+			'Label.js',
+			'BaseMarkerMethods.js',
+			'Marker.Label.js',
+			'CircleMarker.Label.js',
+			'Path.Label.js',
+			'Map.Label.js',
+			'FeatureGroup.Label.js'
+		],
+		desc: 'Leaflet.label plugin files.',
+		deps: ['Core']
+	}
+};
+
+if (typeof exports !== 'undefined') {
+	exports.deps = deps;
+}

data/lib/leaflet.label/build/hint.js

@@ -0,0 +1,30 @@
+var jshint = require('jshint').JSHINT,
+	fs = require('fs'),
+	config = require('./hintrc.js').config;
+
+function jshintSrc(path, src) {
+	jshint(src, config);
+	
+	var errors = jshint.errors,
+		i, len, e, line;
+	
+	for (i = 0, len = errors.length; i < len; i++) {
+		e = errors[i];
+		//console.log(e.evidence);
+		console.log(path + '\tline ' + e.line + '\tcol ' + e.character + '\t ' + e.reason);
+	}
+	
+	return len;
+}
+	
+exports.jshint = function (files) {
+	var errorsFound = 0;
+	
+	for (var i = 0, len = files.length; i < len; i++) {
+		var src = fs.readFileSync(files[i], 'utf8');
+		
+		errorsFound += jshintSrc(files[i], src);
+	}
+	
+	return errorsFound;
+};