leaflet providers

This commit is contained in:
Nils Schneider 2015-04-09 19:45:00 +02:00
parent 95a0f8974b
commit 0758614688
3 changed files with 7 additions and 3 deletions

2
app.js
View File

@ -3,6 +3,7 @@ require.config({
paths: { paths: {
"leaflet": "../bower_components/leaflet/dist/leaflet", "leaflet": "../bower_components/leaflet/dist/leaflet",
"leaflet.label": "../bower_components/Leaflet.label/dist/leaflet.label", "leaflet.label": "../bower_components/Leaflet.label/dist/leaflet.label",
"leaflet.providers": "../bower_components/leaflet-providers/leaflet-providers",
"chroma-js": "../bower_components/chroma-js/chroma.min", "chroma-js": "../bower_components/chroma-js/chroma.min",
"moment": "../bower_components/moment/min/moment-with-locales.min", "moment": "../bower_components/moment/min/moment-with-locales.min",
"tablesort": "../bower_components/tablesort/tablesort.min", "tablesort": "../bower_components/tablesort/tablesort.min",
@ -15,6 +16,7 @@ require.config({
}, },
shim: { shim: {
"leaflet.label": ["leaflet"], "leaflet.label": ["leaflet"],
"leaflet.providers": ["leaflet"],
"tablesort": { "tablesort": {
exports: "Tablesort" exports: "Tablesort"
}, },

View File

@ -22,7 +22,8 @@
"d3": "~3.5.5", "d3": "~3.5.5",
"numeraljs": "~1.5.3", "numeraljs": "~1.5.3",
"roboto-fontface": "~0.3.0", "roboto-fontface": "~0.3.0",
"virtual-dom": "~2.0.1" "virtual-dom": "~2.0.1",
"leaflet-providers": "~1.0.27"
}, },
"authors": [ "authors": [
"Nils Schneider <nils@nilsschneider.net>" "Nils Schneider <nils@nilsschneider.net>"

View File

@ -1,4 +1,5 @@
define(["d3", "leaflet", "moment", "locationmarker", "leaflet.label"], define(["d3", "leaflet", "moment", "locationmarker", "leaflet.label",
"leaflet.providers"],
function (d3, L, moment, LocationMarker) { function (d3, L, moment, LocationMarker) {
var options = { worldCopyJump: true, var options = { worldCopyJump: true,
zoomControl: false zoomControl: false
@ -40,7 +41,7 @@ define(["d3", "leaflet", "moment", "locationmarker", "leaflet.label"],
onClick: function () { onClick: function () {
this.f(!this.active) this.f(!this.active)
} }
}) })
function mkMarker(dict, iconFunc, router) { function mkMarker(dict, iconFunc, router) {
return function (d) { return function (d) {