leaflet-js 0.7.0.4 → 0.7.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db6588e8e19d255aea9637a11f4348a2a34d8b1d
-  data.tar.gz: fb3857347dad05f8884d961188d1b7ba031700ca
+  metadata.gz: 204fe034beb685a0bc5b0391162b0bdb37bff253
+  data.tar.gz: 7db65b775cd11fe998441d0f3ea5283a698ff130
 SHA512:
-  metadata.gz: 557cdbbe76e31fc64a359206c5fb339400fdb84f386ab8681602f19171090da5e24a6881b597c899526214212e5d04b270b6e5e3c789bdd351fd568ad6df66cf
-  data.tar.gz: a8a32af9cd837b8ff51254dbd2ad00313c1a72383403a22f5380b37e458f3ed2191cf29bd17e82be31a55f06256ce635c3df20dbc6058e146d4a47d50a5b7754
+  metadata.gz: 5887dc2e3b457cce841d8abf3ef66d07bc3694d311673422a8b7c264e7ffc6e5927ad8b47c26807252366a9486e5e3f87ce28bb3d3ddcfc2d76d666a9b0f975c
+  data.tar.gz: bbb3823e9b0897e69b9ad4d316d1ba36a576bac08010de0148f94590e0cb99fdd683fb660941db6bdb59ecdd1224c2ef83586f78d516aa4b0f8b681c54217e50

data/CHANGELOG.rdoc

@@ -1,9 +1,16 @@
 = leaflet-js Changelog
 
-=== 0.7.0.4 (December 20, 2013)
-* Remove leaflet-js from asset path call
+=== 0.7.7 (December 6, 2015)
+* Update to leaflet 0.7.7
+* Revamp how assets are setup to work with newer versions of spockets
 
-=== 0.7.0.3 (November 25, 2013)
+=== 0.8.dev2 (January 30, 2014)
+* Update to latest version of leaflet (0.8 master)
+
+=== 0.8.dev1 (January 28, 2014)
+* Update to latest version of leaflet (0.8 master)
+
+=== 0.7.0.2 (November 25, 2013)
 * Ungroup assets, that idea did not work very well.
 
 === 0.7.0.1 (November 25, 2013)

data/Rakefile

@@ -1,9 +1,9 @@
 #!/usr/bin/env ruby
 
-require "rubygems"
-require "rubygems/package_task"
+require 'rubygems'
+require 'rubygems/package_task'
 
-GEM_NAME = "leaflet-js"
+GEM_NAME = 'leaflet-js'
 
 # Read the spec file
 spec = Gem::Specification.load("#{GEM_NAME}.gemspec")

data/leaflet-js.gemspec

@@ -1,7 +1,9 @@
 # encoding: utf-8
+require_relative 'lib/leaflet-js/version'
+
 Gem::Specification.new do |spec|
   spec.name        = 'leaflet-js'
-  spec.version     = '0.7.0.4'
+  spec.version     = Leaflet::VERSION
   spec.homepage    = 'https://github.com/cfis/leaflet-js'
   spec.summary     = <<-EOS
 Wraps the Leaflet Javascript Mapping Library in a Rails asset gem. Also include Leaflet.Label
@@ -16,12 +18,16 @@ EOS
                          'Rakefile',
                          'README.rdoc',
                          'lib/leaflet-js.rb',
-                         'lib/leaflet/**/*',
-                         'lib/leaflet.draw/**/*',
-                         'lib/leaflet.label/**/*',
-                         'vendor/assets/javascripts/*',
-                         'vendor/assets/stylesheets/*',
-                         'vendor/assets/images/*'])
+                         'lib/leaflet-js/version.rb',
+                         'lib/leaflet-js/engine.rb',
+                         'vendor/assets/Leaflet/src/**/*',
+                         'vendor/assets/Leaflet/dist/images/*',
+                         'vendor/assets/Leaflet.draw/src/**/*',
+                         'vendor/assets/Leaflet.draw/dist/images/*',
+                         'vendor/assets/Leaflet.label/src/**/*',
+                         'vendor/assets/*.js',
+                         'vendor/assets/*.css',
+                         'vendor/assets/*.erb'])
   spec.required_ruby_version = '>= 1.9.3'
   spec.license = 'MIT'
   spec.date = Time.now

data/lib/leaflet-js.rb

@@ -1,10 +1,2 @@
-module Leaflet
-  class Engine < Rails::Engine
-    initializer :append_assets_path do |app|
-      # Javascripts
-      app.config.assets.paths << File.join(config.root, 'lib', 'leaflet', 'src')
-      app.config.assets.paths << File.join(config.root, 'lib', 'leaflet.draw', 'src')
-      app.config.assets.paths << File.join(config.root, 'lib', 'leaflet.label', 'src')
-    end
-  end
-end
+require 'leaflet-js/version'
+require 'leaflet-js/engine'

data/lib/leaflet-js/engine.rb

@@ -0,0 +1,7 @@
+module Leaflet
+  class Engine < ::Rails::Engine
+    initializer :append_assets_path do |app|
+      app.config.assets.paths << File.join(config.root, 'vendor', 'assets')
+    end
+  end
+end

data/lib/leaflet-js/version.rb

@@ -0,0 +1,3 @@
+module Leaflet
+  VERSION = '0.7.7'
+end

data/{lib/leaflet.draw → vendor/assets/Leaflet.draw}/src/Control.Draw.js

@@ -7,33 +7,33 @@ L.Control.Draw = L.Control.extend({
 	},
 
 	initialize: function (options) {
-		if (L.version <= "0.5.1") {
-			throw new Error('Leaflet.draw 0.2.0+ requires Leaflet 0.6.0+. Download latest from https://github.com/Leaflet/Leaflet/');
+		if (L.version < '0.7') {
+			throw new Error('Leaflet.draw 0.2.3+ requires Leaflet 0.7.0+. Download latest from https://github.com/Leaflet/Leaflet/');
 		}
 
 		L.Control.prototype.initialize.call(this, options);
 
-		var id, toolbar;
+		var toolbar;
 
 		this._toolbars = {};
 
 		// Initialize toolbars
 		if (L.DrawToolbar && this.options.draw) {
 			toolbar = new L.DrawToolbar(this.options.draw);
-			id = L.stamp(toolbar);
-			this._toolbars[id] = toolbar;
+
+			this._toolbars[L.DrawToolbar.TYPE] = toolbar;
 
 			// Listen for when toolbar is enabled
-			this._toolbars[id].on('enable', this._toolbarEnabled, this);
+			this._toolbars[L.DrawToolbar.TYPE].on('enable', this._toolbarEnabled, this);
 		}
 
 		if (L.EditToolbar && this.options.edit) {
 			toolbar = new L.EditToolbar(this.options.edit);
-			id = L.stamp(toolbar);
-			this._toolbars[id] = toolbar;
+
+			this._toolbars[L.EditToolbar.TYPE] = toolbar;
 
 			// Listen for when toolbar is enabled
-			this._toolbars[id].on('enable', this._toolbarEnabled, this);
+			this._toolbars[L.EditToolbar.TYPE].on('enable', this._toolbarEnabled, this);
 		}
 	},
 
@@ -47,15 +47,17 @@ L.Control.Draw = L.Control.extend({
 			if (this._toolbars.hasOwnProperty(toolbarId)) {
 				toolbarContainer = this._toolbars[toolbarId].addToolbar(map);
 
-				// Add class to the first toolbar to remove the margin
-				if (!addedTopClass) {
-					if (!L.DomUtil.hasClass(toolbarContainer, topClassName)) {
-						L.DomUtil.addClass(toolbarContainer.childNodes[0], topClassName);
+				if (toolbarContainer) {
+					// Add class to the first toolbar to remove the margin
+					if (!addedTopClass) {
+						if (!L.DomUtil.hasClass(toolbarContainer, topClassName)) {
+							L.DomUtil.addClass(toolbarContainer.childNodes[0], topClassName);
+						}
+						addedTopClass = true;
 					}
-					addedTopClass = true;
-				}
 
-				container.appendChild(toolbarContainer);
+					container.appendChild(toolbarContainer);
+				}
 			}
 		}
 
@@ -79,10 +81,10 @@ L.Control.Draw = L.Control.extend({
 	},
 
 	_toolbarEnabled: function (e) {
-		var id = '' + L.stamp(e.target);
+		var enabledToolbar = e.target;
 
 		for (var toolbarId in this._toolbars) {
-			if (this._toolbars.hasOwnProperty(toolbarId) && toolbarId !== id) {
+			if (this._toolbars[toolbarId] !== enabledToolbar) {
 				this._toolbars[toolbarId].disable();
 			}
 		}
@@ -99,4 +101,4 @@ L.Map.addInitHook(function () {
 		this.drawControl = new L.Control.Draw();
 		this.addControl(this.drawControl);
 	}
-});
+});

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

@@ -2,7 +2,7 @@
  * Leaflet.draw assumes that you have already included the Leaflet library.
  */
 
-L.drawVersion = '0.2.3-dev';
+L.drawVersion = '0.2.4-dev';
 
 L.drawLocal = {
 	draw: {
@@ -11,6 +11,10 @@ L.drawLocal = {
 				title: 'Cancel drawing',
 				text: 'Cancel'
 			},
+			undo: {
+				title: 'Delete last point drawn',
+				text: 'Delete last point'
+			},
 			buttons: {
 				polyline: 'Draw a polyline',
 				polygon: 'Draw a polygon',
@@ -23,7 +27,8 @@ L.drawLocal = {
 			circle: {
 				tooltip: {
 					start: 'Click and drag to draw circle.'
-				}
+				},
+				radius: 'Radius'
 			},
 			marker: {
 				tooltip: {
@@ -90,4 +95,4 @@ L.drawLocal = {
 			}
 		}
 	}
-};
+};

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

@@ -19,12 +19,56 @@ L.Toolbar = L.Class.extend({
 		this._activeMode.handler.disable();
 	},
 
+	addToolbar: function (map) {
+		var container = L.DomUtil.create('div', 'leaflet-draw-section'),
+			buttonIndex = 0,
+			buttonClassPrefix = this._toolbarClass || '',
+			modeHandlers = this.getModeHandlers(map),
+			i;
+
+		this._toolbarContainer = L.DomUtil.create('div', 'leaflet-draw-toolbar leaflet-bar');
+		this._map = map;
+
+		for (i = 0; i < modeHandlers.length; i++) {
+			if (modeHandlers[i].enabled) {
+				this._initModeHandler(
+					modeHandlers[i].handler,
+					this._toolbarContainer,
+					buttonIndex++,
+					buttonClassPrefix,
+					modeHandlers[i].title
+				);
+			}
+		}
+
+		// if no buttons were added, do not add the toolbar
+		if (!buttonIndex) {
+			return;
+		}
+
+		// Save button index of the last button, -1 as we would have ++ after the last button
+		this._lastButtonIndex = --buttonIndex;
+
+		// Create empty actions part of the toolbar
+		this._actionsContainer = L.DomUtil.create('ul', 'leaflet-draw-actions');
+
+		// Add draw and cancel containers to the control container
+		container.appendChild(this._toolbarContainer);
+		container.appendChild(this._actionsContainer);
+
+		return container;
+	},
+
 	removeToolbar: function () {
 		// Dispose each handler
 		for (var handlerId in this._modes) {
 			if (this._modes.hasOwnProperty(handlerId)) {
 				// Unbind handler button
-				this._disposeButton(this._modes[handlerId].button, this._modes[handlerId].handler.enable);
+				this._disposeButton(
+					this._modes[handlerId].button,
+					this._modes[handlerId].handler.enable,
+					this._modes[handlerId].handler
+				);
 
 				// Make sure is disabled
 				this._modes[handlerId].handler.disable();
@@ -39,7 +83,11 @@ L.Toolbar = L.Class.extend({
 
 		// Dispose the actions toolbar
 		for (var i = 0, l = this._actionButtons.length; i < l; i++) {
-			this._disposeButton(this._actionButtons[i].button, this._actionButtons[i].callback);
+			this._disposeButton(
+				this._actionButtons[i].button,
+				this._actionButtons[i].callback,
+				this
+			);
 		}
 		this._actionButtons = [];
 		this._actionsContainer = null;
@@ -100,9 +148,7 @@ L.Toolbar = L.Class.extend({
 
 	_handlerActivated: function (e) {
 		// Disable active mode (if present)
-		if (this._activeMode && this._activeMode.handler.enabled()) {
-			this._activeMode.handler.disable();
-		}
+		this.disable();
 
 		// Cache new active feature
 		this._activeMode = this._modes[e.handler];
@@ -124,12 +170,28 @@ L.Toolbar = L.Class.extend({
 		this.fire('disable');
 	},
 
-	_createActions: function (buttons) {
-		var container = L.DomUtil.create('ul', 'leaflet-draw-actions'),
+	_createActions: function (handler) {
+		var container = this._actionsContainer,
+			buttons = this.getActions(handler),
 			l = buttons.length,
-			li, button;
+			li, di, dl, button;
+
+		// Dispose the actions toolbar (todo: dispose only not used buttons)
+		for (di = 0, dl = this._actionButtons.length; di < dl; di++) {
+			this._disposeButton(this._actionButtons[di].button, this._actionButtons[di].callback);
+		}
+		this._actionButtons = [];
+
+		// Remove all old buttons
+		while (container.firstChild) {
+			container.removeChild(container.firstChild);
+		}
 
 		for (var i = 0; i < l; i++) {
+			if ('enabled' in buttons[i] && !buttons[i].enabled) {
+				continue;
+			}
+
 			li = L.DomUtil.create('li', '', container);
 
 			button = this._createButton({
@@ -145,16 +207,15 @@ L.Toolbar = L.Class.extend({
 				callback: buttons[i].callback
 			});
 		}
-
-		return container;
 	},
 
 	_showActionsToolbar: function () {
 		var buttonIndex = this._activeMode.buttonIndex,
 			lastButtonIndex = this._lastButtonIndex,
-			buttonHeight = 26, // TODO: this should be calculated
-			borderHeight = 1, // TODO: this should also be calculated
-			toolbarPosition = (buttonIndex * buttonHeight) + (buttonIndex * borderHeight) - 1;
+			toolbarPosition = this._activeMode.button.offsetTop - 1;
+
+		// Recreate action buttons on every click
+		this._createActions(this._activeMode.handler);
 
 		// Correctly position the cancel button
 		this._actionsContainer.style.top = toolbarPosition + 'px';
@@ -180,4 +241,4 @@ L.Toolbar = L.Class.extend({
 		L.DomUtil.removeClass(this._actionsContainer, 'leaflet-draw-actions-top');
 		L.DomUtil.removeClass(this._actionsContainer, 'leaflet-draw-actions-bottom');
 	}
-});
+});

data/vendor/assets/Leaflet.draw/src/draw/DrawToolbar.js

@@ -0,0 +1,87 @@
+L.DrawToolbar = L.Toolbar.extend({
+
+	statics: {
+		TYPE: 'draw'
+	},
+
+	options: {
+		polyline: {},
+		polygon: {},
+		rectangle: {},
+		circle: {},
+		marker: {}
+	},
+
+	initialize: function (options) {
+		// Ensure that the options are merged correctly since L.extend is only shallow
+		for (var type in this.options) {
+			if (this.options.hasOwnProperty(type)) {
+				if (options[type]) {
+					options[type] = L.extend({}, this.options[type], options[type]);
+				}
+			}
+		}
+
+		this._toolbarClass = 'leaflet-draw-draw';
+		L.Toolbar.prototype.initialize.call(this, options);
+	},
+
+	getModeHandlers: function (map) {
+		return [
+			{
+				enabled: this.options.polyline,
+				handler: new L.Draw.Polyline(map, this.options.polyline),
+				title: L.drawLocal.draw.toolbar.buttons.polyline
+			},
+			{
+				enabled: this.options.polygon,
+				handler: new L.Draw.Polygon(map, this.options.polygon),
+				title: L.drawLocal.draw.toolbar.buttons.polygon
+			},
+			{
+				enabled: this.options.rectangle,
+				handler: new L.Draw.Rectangle(map, this.options.rectangle),
+				title: L.drawLocal.draw.toolbar.buttons.rectangle
+			},
+			{
+				enabled: this.options.circle,
+				handler: new L.Draw.Circle(map, this.options.circle),
+				title: L.drawLocal.draw.toolbar.buttons.circle
+			},
+			{
+				enabled: this.options.marker,
+				handler: new L.Draw.Marker(map, this.options.marker),
+				title: L.drawLocal.draw.toolbar.buttons.marker
+			}
+		];
+	},
+
+	// Get the actions part of the toolbar
+	getActions: function (handler) {
+		return [
+			{
+				enabled: handler.deleteLastVertex,
+				title: L.drawLocal.draw.toolbar.undo.title,
+				text: L.drawLocal.draw.toolbar.undo.text,
+				callback: handler.deleteLastVertex,
+				context: handler
+			},
+			{
+				title: L.drawLocal.draw.toolbar.actions.title,
+				text: L.drawLocal.draw.toolbar.actions.text,
+				callback: this.disable,
+				context: this
+			}
+		];
+	},
+
+	setOptions: function (options) {
+		L.setOptions(this, options);
+
+		for (var type in this._modes) {
+			if (this._modes.hasOwnProperty(type) && options.hasOwnProperty(type)) {
+				this._modes[type].handler.setOptions(options[type]);
+			}
+		}
+	}
+});