From d0a759fb4784fd98ef1893b42a874cad0994c6ff Mon Sep 17 00:00:00 2001 From: James Seppi Date: Mon, 16 Jan 2017 11:37:57 -0600 Subject: [PATCH] rm L.MakiMarkers.icons array, add ref to source list --- Leaflet.MakiMarkers.js | 20 ++------------------ README.md | 3 ++- bower.json | 2 +- 3 files changed, 5 insertions(+), 20 deletions(-) diff --git a/Leaflet.MakiMarkers.js b/Leaflet.MakiMarkers.js index cef438d..3227e56 100644 --- a/Leaflet.MakiMarkers.js +++ b/Leaflet.MakiMarkers.js @@ -4,6 +4,7 @@ * References: * Maki Icons: https://www.mapbox.com/maki/ * Mapbox Marker API: https://www.mapbox.com/api-documentation/#retrieve-a-standalone-marker + * Possible icon names: https://raw.githubusercontent.com/mapbox/maki/master/layouts/all.json * * Usage: * L.MakiMarkers.accessToken = ""; @@ -16,23 +17,6 @@ (function () { "use strict"; L.MakiMarkers = { - // Available Maki Icons - icons: ["airfield","airport","alcohol-shop","america-football","art-gallery","bakery","bank","bar", - "baseball","basketball","beer","bicycle","building","bus","cafe","camera","campsite","car", - "cemetery","chemist","cinema","circle-stroked","circle","city","clothing-store","college", - "commercial","cricket","cross","dam","danger","disability","dog-park","embassy", - "emergency-telephone","entrance","farm","fast-food","ferry","fire-station","fuel","garden", - "golf","grocery","hairdresser","harbor","heart","heliport","hospital","industrial", - "land-use","laundry","library","lighthouse","lodging","logging","london-underground", - "marker-stroked","marker","minefield","mobilephone","monument","museum","music","oil-well", - "park2","park","parking-garage","parking","pharmacy","pitch","place-of-worship", - "playground","police","polling-place","post","prison","rail-above","rail-light", - "rail-metro","rail-underground","rail","religious-christian","religious-jewish", - "religious-muslim","restaurant","roadblock","rocket","school","scooter","shop","skiing", - "slaughterhouse","soccer","square-stroked","square","star-stroked","star","suitcase", - "swimming","telephone","tennis","theatre","toilets","town-hall","town","triangle-stroked", - "triangle","village","warehouse","waste-basket","water","wetland","zoo" - ], accessToken: null, defaultColor: "#0a0", defaultIcon: "circle-stroked", @@ -57,7 +41,7 @@ //Mapbox API access token, see https://www.mapbox.com/api-documentation/?language=CLI#access-tokens //Instead of setting with each icon, you can set globally as L.MakiMarkers.accessToken accessToken: null, - //Maki icon: any from https://www.mapbox.com/maki/ (ref: L.MakiMarkers.icons) + //Maki icon: any valid name, see https://raw.githubusercontent.com/mapbox/maki/master/layouts/all.json icon: L.MakiMarkers.defaultIcon, //Marker color: short or long form hex color code color: L.MakiMarkers.defaultColor, diff --git a/README.md b/README.md index c21594d..4152558 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,8 @@ The most recent version of Mapbox's static API (v4) requires that a valid access L.MakiMarkers.accessToken = ""; // Specify a Maki icon name, hex color, and size (s, m, or l). -// An array of icon names can be found in L.MakiMarkers.icons or at https://www.mapbox.com/maki/ +// A list of available icon names can be found at +// https://raw.githubusercontent.com/mapbox/maki/master/layouts/all.json // Lowercase letters a-z and digits 0-9 can also be used. A value of null will result in no icon. // Color may also be set to null, which will result in a gray marker. var icon = L.MakiMarkers.icon({icon: "rocket", color: "#b0b", size: "m"}); diff --git a/bower.json b/bower.json index 82f8145..6ce2ed1 100644 --- a/bower.json +++ b/bower.json @@ -1,7 +1,7 @@ { "name": "Leaflet.MakiMarkers", "main": "Leaflet.MakiMarkers.js", - "version": "2.0.0", + "version": "3.0.0", "homepage": "https://github.com/jseppi/Leaflet.MakiMarkers", "authors": [ "James Seppi "