Nouveaux icônes

app/QuickFeatureSearch.tsx

@@ -17,7 +17,8 @@ import {
 	SpinningDiscBorder,
 } from './QuickFeatureSearchUI'
 import categories from './categories.yaml'
-import moreCategories from './moreCategories.yaml'
+import { filteredMoreCategories } from '@/components/categories'
+const moreCategories = filteredMoreCategories
 import categoryIconUrl from '@/components/categoryIconUrl'
 
 export function initializeFuse(categories) {

app/effects/fetchOverpassRequest.ts

@@ -1,5 +1,5 @@
 import categories from '@/app/categories.yaml'
-import moreCategories from '@/app/moreCategories.yaml'
+import { filteredMoreCategories as moreCategories } from '@/components/categories'
 import {
 	enrichOsmFeatureWithPolyon,
 	overpassRequestSuffix,

app/moreCategories.yaml

@@ -280,38 +280,38 @@
     - charcuterie
     - charcutier
   query: '[shop=butcher]'
-  icon: butcher
+  icon: meat
 
-- name: Café
+- name: Boutique de café
   category: Alimentation
   dictionary:
     - torréfacteur
   query: '[shop=coffee]'
-  icon: coffee
+  icon: cafe
 
 - name: Caviste
   category: Alimentation
   dictionary:
     - vin
     - bouteille
   query: '[shop=wine]'
-  icon: wine
+  icon: bottle
 
 - name: Confiserie
   category: Alimentation
   dictionary:
     - bonbon
     - sucrerie
   query: '[shop=confectionery]'
-  icon: confectionery
+  icon: candy
 
 - name: Chocolatier
   category: Alimentation
   dictionary:
     - chocolat
     - tablette
   query: '[shop=chocolate]'
-  icon: mx_chocolate
+  icon: chocolate
 
 - name: Épicerie fine
   category: Alimentation
@@ -334,10 +334,11 @@
     - glace
     - sorbet
   query: '[shop=ice_cream]'
-  icon: ice_cream
+  icon: ice-cream
 
 - name: Miellerie
   category: Alimentation
+  inactive: Very specific; needs icon
   dictionary:
     - miel
     - propolis
@@ -361,15 +362,15 @@
     - crustacé
     - fruits de mer
   query: '[shop=seafood]'
-  icon: mx_shop_seafood
+  icon: fish
 
 - name: Primeur
   category: Alimentation
   dictionary:
     - fruits
     - légumes
   query: '[shop=greengrocer]'
-  icon: greengrocer
+  icon: grapes
 
 - name: Produits de la ferme
   category: Alimentation

app/svgo/route.ts

@@ -34,9 +34,21 @@ const fromSvgToImgSrc = (imageText, background) => {
 	})
 	*/
 
-	const svgSize = svg.getAttribute('width'), // Icons must be square !
-		xyr = svgSize / 2
+	let svgSize = svg.getAttribute('width') // Icons must be square !
 
+	if (!svgSize) {
+		const viewBox = svg.getAttribute('viewBox')
+		const dimensions = viewBox.split(' ')
+		const startsAtZero = dimensions[0] === dimensions[1] && dimensions[0] == 0
+		const sameExtend = dimensions[2] === dimensions[3]
+		if (!startsAtZero || !sameExtend)
+			throw new Error(
+				'The SVG should have width and height attributes and a corresponding viewBox'
+			)
+		svgSize = dimensions[2]
+	}
+
+	const xyr = svgSize / 2
 	const backgroundDisk = `<circle
      style="fill:${encodeURIComponent(background)};fill-rule:evenodd"
      cx="${xyr}"

components/categories.ts

@@ -1,7 +1,11 @@
 import baseCategories from '@/app/categories.yaml'
 import moreCategories from '@/app/moreCategories.yaml'
 
-export const categories = [...baseCategories, ...moreCategories]
+export const filteredMoreCategories = moreCategories.filter(
+	(cat) => !cat.inactive
+)
+
+export const categories = [...baseCategories, ...filteredMoreCategories]
 
 // use this to complete categoryColors.yaml