diff --git a/icons/aerialway-11.svg b/icons/aerialway-11.svg index 9fbd479b..249a4823 100644 --- a/icons/aerialway-11.svg +++ b/icons/aerialway-11.svg @@ -3,7 +3,7 @@ - diff --git a/icons/dog-park-15.svg b/icons/dog-park-15.svg index e698703c..a315b770 100644 --- a/icons/dog-park-15.svg +++ b/icons/dog-park-15.svg @@ -1,18 +1,49 @@ - + - - - - - - - + +image/svg+xml \ No newline at end of file diff --git a/icons/farm-11.svg b/icons/farm-11.svg new file mode 100644 index 00000000..8e252206 --- /dev/null +++ b/icons/farm-11.svg @@ -0,0 +1,5 @@ + + farm-11 + + + diff --git a/icons/farm-15.svg b/icons/farm-15.svg new file mode 100644 index 00000000..b051c235 --- /dev/null +++ b/icons/farm-15.svg @@ -0,0 +1,4 @@ + + farm-15 + + diff --git a/icons/grocery-15.svg b/icons/grocery-15.svg index 627c7ba4..d1606690 100644 --- a/icons/grocery-15.svg +++ b/icons/grocery-15.svg @@ -1,16 +1,48 @@ - + - - - - - - - - + +image/svg+xml \ No newline at end of file diff --git a/icons/rail-15.svg b/icons/rail-15.svg index 2993da56..726a188d 100644 --- a/icons/rail-15.svg +++ b/icons/rail-15.svg @@ -1,16 +1,49 @@ - + - - - - - + +image/svg+xml \ No newline at end of file diff --git a/layouts/all.json b/layouts/all.json index c5df2374..8659a4e5 100644 --- a/layouts/all.json +++ b/layouts/all.json @@ -1 +1 @@ -{"all":["aerialway","airfield","airport","alcohol-shop","america-football","amusement-park","aquarium","art-gallery","attraction","bakery","bank","bar","baseball","basketball","beer","bicycle","bicycle-share","building","bus","cafe","campsite","car","castle","cemetery","cinema","circle","circle-stroked","clothing-store","college","commercial","cricket","cross","dam","danger","dentist","doctor","dog-park","drinking-water","embassy","entrance","fast-food","ferry","fire-station","fuel","garden","gift","golf","grocery","hairdresser","harbor","heart","heliport","hospital","ice-cream","industry","information","laundry","library","lighthouse","lodging","marker","monument","mountain","museum","music","park","parking","parking-garage","pharmacy","picnic-site","pitch","place-of-worship","playground","police","post","prison","rail","rail-light","rail-metro","ranger-station","religious-christian","religious-jewish","religious-muslim","restaurant","roadblock","rocket","school","shelter","shop","skiing","soccer","square","square-stroke","stadium","star","star-stroke","suitcase","sushi","swimming","telephone","tennis","theatre","toilet","town-hall","triangle","triangle-stroked","veterinary","volcano","warehouse","waste-basket","water","wetland","wheelchair","zoo"]} \ No newline at end of file +{"all":["aerialway","airfield","airport","alcohol-shop","america-football","amusement-park","aquarium","art-gallery","attraction","bakery","bank","bar","baseball","basketball","beer","bicycle","bicycle-share","building","bus","cafe","campsite","car","castle","cemetery","cinema","circle","circle-stroked","clothing-store","college","commercial","cricket","cross","dam","danger","dentist","doctor","dog-park","drinking-water","embassy","entrance","farm","fast-food","ferry","fire-station","fuel","garden","gift","golf","grocery","hairdresser","harbor","heart","heliport","hospital","ice-cream","industry","information","laundry","library","lighthouse","lodging","marker","monument","mountain","museum","music","park","parking","parking-garage","pharmacy","picnic-site","pitch","place-of-worship","playground","police","post","prison","rail","rail-light","rail-metro","ranger-station","religious-christian","religious-jewish","religious-muslim","restaurant","roadblock","rocket","school","shelter","shop","skiing","soccer","square","square-stroke","stadium","star","star-stroke","suitcase","sushi","swimming","telephone","tennis","theatre","toilet","town-hall","triangle","triangle-stroked","veterinary","volcano","warehouse","waste-basket","water","wetland","wheelchair","zoo"]} \ No newline at end of file diff --git a/package.json b/package.json index c4404d58..e421191b 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "author": "Mapbox", "name": "maki", "description": "Pixel-perfect icons for web cartography", - "version": "2.0.2", + "version": "2.0.4", "main": "index.js", "scripts": { "test": "tape test/maki.test.js | tap-spec", diff --git a/test/maki.test.js b/test/maki.test.js index a37ebea1..7552c9d2 100644 --- a/test/maki.test.js +++ b/test/maki.test.js @@ -1,11 +1,30 @@ var fs = require('fs'), path = require('path'), test = require('tape'), - xml2js = require('xml2js'); + xml2js = require('xml2js'), + makiLayoutAll = require('../layouts/all'); var parseString = xml2js.parseString; -test('valid svgs', function(t) { +test('all.json layout ', function(t) { + fs.readdir('./icons/', function(err, files) { + var svgFiles = files.filter(function(file) { + return file.split('.').pop().indexOf('svg') !== -1; + }); + var filtered = svgFiles + .filter(function(file) { + return file.indexOf('-11.svg') > -1; + }) + .map(function(file) { + return file.split('-11.svg')[0]; + }); + t.deepEqual(filtered, makiLayoutAll.all, 'includes all icons'); + t.end(); + }); + +}); + +test('valid svgs ', function(t) { fs.readdir('./icons/', function(err, files) { var svgFiles = files.filter(function(file) {