From e863e4188cc80e1c1727e2572a132a4303432f9c Mon Sep 17 00:00:00 2001 From: Norbert Renner Date: Wed, 18 May 2022 16:02:12 +0200 Subject: [PATCH] Remove maki file name postfix "-11" after update --- js/LayersConfig.js | 3 +-- package.json | 52 +++++++++++++++++++++++----------------------- 2 files changed, 27 insertions(+), 28 deletions(-) diff --git a/js/LayersConfig.js b/js/LayersConfig.js index e8ebbc2..224088f 100644 --- a/js/LayersConfig.js +++ b/js/LayersConfig.js @@ -191,8 +191,7 @@ BR.LayersConfig = L.Class.extend({ if (icon && iconPrefix.test(icon)) { const iconName = icon.replace(iconPrefix, ''); - const postfix = icon.startsWith('maki-') ? '-11' : ''; - iconUrl = `dist/images/${iconName}${postfix}.svg`; + iconUrl = `dist/images/${iconName}.svg`; } return iconUrl; diff --git a/package.json b/package.json index 5c122bc..5b75074 100644 --- a/package.json +++ b/package.json @@ -303,32 +303,32 @@ }, "@mapbox/maki": { "main": [ - "icons/art-gallery-11.svg", - "icons/bakery-11.svg", - "icons/bank-11.svg", - "icons/bar-11.svg", - "icons/bbq-11.svg", - "icons/beer-11.svg", - "icons/bicycle-11.svg", - "icons/cafe-11.svg", - "icons/campsite-11.svg", - "icons/car-11.svg", - "icons/car-rental-11.svg", - "icons/drinking-water-11.svg", - "icons/entrance-alt1-11.svg", - "icons/fast-food-11.svg", - "icons/fuel-11.svg", - "icons/grocery-11.svg", - "icons/hospital-11.svg", - "icons/information-11.svg", - "icons/lodging-11.svg", - "icons/picnic-site-11.svg", - "icons/restaurant-11.svg", - "icons/shelter-11.svg", - "icons/shop-11.svg", - "icons/star-11.svg", - "icons/toilet-11.svg", - "icons/water-11.svg" + "icons/art-gallery.svg", + "icons/bakery.svg", + "icons/bank.svg", + "icons/bar.svg", + "icons/bbq.svg", + "icons/beer.svg", + "icons/bicycle.svg", + "icons/cafe.svg", + "icons/campsite.svg", + "icons/car.svg", + "icons/car-rental.svg", + "icons/drinking-water.svg", + "icons/entrance-alt1.svg", + "icons/fast-food.svg", + "icons/fuel.svg", + "icons/grocery.svg", + "icons/hospital.svg", + "icons/information.svg", + "icons/lodging.svg", + "icons/picnic-site.svg", + "icons/restaurant.svg", + "icons/shelter.svg", + "icons/shop.svg", + "icons/star.svg", + "icons/toilet.svg", + "icons/water.svg" ] }, "@ideditor/temaki": {