IKEA assembly, step by step: animated, manual-style 3D guides. Scan any paper manual with Together AI.
TypeScript
Draw cabinets for ovens, fridges, hobs and microwaves
Yousseffdf1fd1de8bd
diff --git a/scripts/ikea/build.ts b/scripts/ikea/build.tsindex 7273c75..9004713 100644--- a/scripts/ikea/build.ts+++ b/scripts/ikea/build.ts@@ -59,7 +59,7 @@ function hints(family: string, kind: Kind): Hint | undefined {/* ---------- matching against hand made entries ---------- */-const LATER_KINDS = new Set<Kind>(["office", "chaise", "corner", "cot", "bunk", "loft", "dropleaf", "daybed", "mixed", "sliding", "slidecab", "bookrow", "cabrow", "section", "gateleg", "washstand", "sinkcab"]);+const LATER_KINDS = new Set<Kind>(["office", "chaise", "corner", "cot", "bunk", "loft", "dropleaf", "daybed", "mixed", "sliding", "slidecab", "bookrow", "cabrow", "section", "gateleg", "washstand", "sinkcab", "appliance"]);function baseMatch(name: string, draw: Draw): CatalogEntry | undefined {const fam = fold(name);diff --git a/scripts/ikea/check.ts b/scripts/ikea/check.tsindex 9cf9de9..e9eac85 100644--- a/scripts/ikea/check.ts+++ b/scripts/ikea/check.ts@@ -120,6 +120,9 @@ async function main() {// the same for a kitchen's sink cabinetexpect("enhet sink cabinet", "enhet-base-cb-f-sink-60-x-60-x-75");expect("metod base cabinet", "metod-base-cabinet-shelves-60-x-60");+ // and for appliance cabinets: a hob unit when asked for, the plain high cabinet otherwise+ expect("metod hob unit", "metod-knivshult-base-cab-f-hob-2-fronts-3-drawer");+ expect("metod high cabinet", "metod-high-cabinet-shelves-40-x-37-x-200");if (articleNo("S292.975.72") !== "29297572") fail("article numbers with an S in front don't parse");for (const [no, slug] of [["60324520", "kallax-2x2"]] as const) {if (articleSlug(no) !== slug) fail(`article ${no} gave ${articleSlug(no)}, expected ${slug}`);diff --git a/scripts/ikea/classify.ts b/scripts/ikea/classify.tsindex 08f960c..74c3d73 100644--- a/scripts/ikea/classify.ts+++ b/scripts/ikea/classify.ts@@ -73,7 +73,7 @@ export function measure(s: string): Size | null {return { n: parts.map((p) => Number(p.split("/")[0])), ext: parts.some((p) => p.includes("/")), text: parts.join(" × ") + " cm" };}-const UPRIGHT = new Set<Kind>(["cube", "bookcase", "open", "chest", "nightstand", "wardrobe", "cabinet", "sideboard", "tv", "shoe", "wallcab", "wallshelf", "kitchen", "mixed", "sliding", "slidecab", "washstand", "sinkcab"]);+const UPRIGHT = new Set<Kind>(["cube", "bookcase", "open", "chest", "nightstand", "wardrobe", "cabinet", "sideboard", "tv", "shoe", "wallcab", "wallshelf", "kitchen", "mixed", "sliding", "slidecab", "washstand", "sinkcab", "appliance"]);const FLAT = new Set<Kind>(["desk", "coffee", "side", "dining", "bar", "console", "kidstable", "trolley", "bench"]);/** Office chairs IKEA sells with armrests although the type doesn't say so. */@@ -121,6 +121,11 @@ const withDoors = (kind: Kind, t: string): Pick => {/** METOD combinations whose second name is a drawer system: the fronts are drawers, not doors. */const DRAWER_SYSTEM = /\b(MAXIMERA|KNIVSHULT)\b/;const doorsFor = (c: Ctx) => ((c.sz.n[0] ?? 60) >= 80 ? 2 : 1);+/** A high cabinet's front: what's under the appliance, a 60 cm opening, and a door over it when there's room. */+function tallFront(c: Ctx, use: NonNullable<X["use"]>, low: string, top: string): Pick {+ const h = c.sz.n[2] ?? 200;+ return { kind: "appliance", x: { use, z: `${low}+g@60${h - 140 >= 20 ? `+${top}` : ""}` } };+}/** Most specific first. A string result is the reason to skip. */const RULES: Rule[] = [@@ -136,6 +141,29 @@ const RULES: Rule[] = [[/^(?:base cab f sink\/waste sorting|sink cabinet with (?:door|organiser))$/, (_m, c) => ({ kind: "sinkcab", x: { z: `d${doorsFor(c)}` } })],// frames sold without fronts[/^base cb f (?:built-in appliances\/)?sink$/, () => ({ kind: "sinkcab", x: { z: "o" } })],+ // cabinets with room for an oven, a fridge or a microwave, and base cabinets under a hob: the appliance is fitted afterwards+ [/^high cabinet f built-in appliances$/, (_m, c) =>+ tallFront(c, "appliance", DRAWER_SYSTEM.test(c.f.name) ? "r2@80" : c.f.spr ? "d1@80" : "o@80", c.f.spr ? "d1" : "o")],+ [/^high cab f oven w 2 doors\/shelves$/, (_m, c) => tallFront(c, "oven", "d1s1@80", "d1s1")],+ [/^(?:high cab f oven w door|high cabinet f oven\+door)\/(\d) drawers$/, (m, c) => tallFront(c, "oven", `r${m[1]}@80`, "d1")],+ [/^high cabinet w (\d) drawers for oven$/, (m, c) => tallFront(c, "oven", `r${m[1]}@80`, "d1")],+ [/^hi cab f ov w dr\/(\d) frnts?\//, (m, c) => tallFront(c, "oven", `r${m[1]}@80`, "d1")],+ [/^high cab f micro w 2 doors\/shelves$/, () => ({ kind: "appliance", x: { use: "microwave", z: "d1s2@100+g@40+d1s1" } })],+ // fridges and freezers: the appliance's own door is fixed to the cabinet door, by its own instructions+ [/^(?:hi|high) cab(?:inet)? f(?:or)? fridge(?:(?: or |\/)freezer)?(?: w(?:ith)? (?:(\d) )?(doors?|drs))?$/, (m, c) => {+ const n = m[1] ? Number(m[1]) : m[2] === "door" ? 1 : m[2] ? 2 : c.f.spr ? ((c.sz.n[2] ?? 200) >= 140 ? 2 : 1) : 0;+ if (n > 3) return "fridge cabinet with more than 3 doors";+ return { kind: "appliance", x: { use: "fridge", z: ["g+o@40", "d1", "d1+d1@60", "d1+d1+d1@60"][n] } };+ }],+ [/^base cabinet f built-in appliances$/, (_m, c) => ({ kind: "appliance", x: { use: "appliance", z: DRAWER_SYSTEM.test(c.f.name) ? "r1@20+g@60" : "o@20+g@60" } })],+ [/^base cabinet for oven with drawer$/, () => ({ kind: "appliance", x: { use: "oven", z: "r1@20+g@60" } })],+ [/^base cab for hob\+oven w drawer$/, () => ({ kind: "appliance", x: { use: "ovenhob", z: "r1@20+g@60" } })],+ [/^base cab f hob\/(\d) fronts\/\d drawers$/, (m) => ({ kind: "appliance", x: { use: "hob", z: `r${m[1]}` } })],+ [/^base cab f hob\/.*(wire|extractor)/, (m) => (m[1] === "wire" ? "base cabinet for a hob with wire baskets" : "base cabinet for a hob with a built-in extractor")],+ [/^wall cabinet for microwave oven$/, () => ({ kind: "appliance", x: { use: "microwave", z: "g@40+d1", hung: true } })],+ [/^wall cb f extr hood w shlf\/door$/, () => ({ kind: "appliance", x: { use: "hood", z: "d1s1", hung: true } })],+ [/^wall cabinet f b-in extractor hood$/, () => ({ kind: "appliance", x: { use: "hood", z: "o", hung: true } })],+ [/^top cabinet for fridge\/freezer$/, () => ({ kind: "appliance", x: { use: "fridge", z: "d1", hung: true } })],// cabinets with doors and drawers: the drawers under the doors, or one drawer above the door of a kitchen base cabinet[/^(glass-door cabinet with|high cabinet w gls-drs and) (\d) drawers?$/, (m) => ({ kind: "mixed", x: { rows: Number(m[2]) } })],[/^wardrobe with (\d) doors and (\d) drawers$/, (m) => (Number(m[1]) > 2 ? "wardrobe with more than 2 doors and drawers" : { kind: "mixed", x: { doors: Number(m[1]) as 1 | 2, rows: Number(m[2]), rail: true } })],@@ -210,7 +238,9 @@ const RULES: Rule[] = [({ kind: "washstand", x: { z: `d${m[1] ? Math.min(2, Number(m[1])) : (c.sz.n[0] ?? 60) > 50 ? 2 : 1}`, basin: c.multi ? 6 : undefined } })],[/^base (?:cb|cabinet) f(?:or)? wash-?basin w(?:ith)? (\d) drawers$/, (m) => ({ kind: "washstand", x: { z: `r${m[1]}` } })],[/^base frame for wash-?basin$/, () => ({ kind: "washstand", x: { z: "o" } })],- [/sink|wash-?basin|wash-?st|hob\b|oven|fridge|freezer|dishwasher|microwave|extractor|appliances|kitchenette|outdoor kitchen/, () => "appliance or sink unit"],+ // the appliances, sinks, basins, taps and hoods themselves, and the fronts that go on a dishwasher+ [/sink|wash-?basin|wash-?st|hob\b|\boven|fridge|freezer|dishwasher|microwave|extractor|appliances|kitchenette|outdoor kitchen/, (_m, c) =>+ c.f.cats[0] === "od001" ? "outdoor kitchen" : "appliance, sink, tap or hood"],[/^(door\/)?drawer front|^drawer (without |with (framed )?(glass )?)front|^(high|medium|low) drawer with front|^fitting for mounting/, () => "door or drawer front sold alone"],[/drawers?\b.*\b(doors?|fronts?|shelves|baskets?)\b|\b(doors?|fronts?|shelves|baskets?)\b.*\bdrawers?\b/, () => "mixed doors and drawers"],@@ -343,7 +373,7 @@ export function classify(f: Fact, hints: Hints): Verdict {if (sz.ext) return { skip: "corner or extendable unit" };if (v.length === 3) set(v[0], v[2], v[1]);else if (v.length === 2) {- if ((kind === "kitchen" || kind === "mixed" || kind === "sinkcab") && /^base/.test(t)) set(v[0], 80, v[1]);+ if ((kind === "kitchen" || kind === "mixed" || kind === "sinkcab" || kind === "appliance") && /^base/.test(t)) set(v[0], 80, v[1]);// bedside tables are measured from above, like tableselse if (kind === "nightstand" && /bedside|nightstand/.test(t)) set(v[0], hint?.kind === kind ? hint.h : 55, v[1]);else set(v[0], v[1]);@@ -363,6 +393,8 @@ export function classify(f: Fact, hints: Hints): Verdict {}if (h - (x.basin ?? 0) <= 70 && !WASH_FLOOR.has(family)) x.hung = true;}+ // a METOD wall cabinet is 37 deep, except the one over a fridge, which is as deep as the fridge's cabinet+ if (kind === "appliance" && guessed.d) d = x.hung && x.use !== "fridge" ? 37 : 60;} else if (FLAT.has(kind)) {if (v.length === 3) set(v[0], v[2], v[1]);else if (v.length === 2) set(v[0], undefined, v[1]);@@ -466,7 +498,7 @@ export function classify(f: Fact, hints: Hints): Verdict {}// parameters from the type name, the size and the family's hand made rows- if (hint?.x.knobs && ["chest", "nightstand", "wardrobe", "cabinet", "sideboard", "tv", "shoe", "wallcab", "kitchen", "mixed", "washstand", "sinkcab"].includes(kind)) x.knobs = hint.x.knobs;+ if (hint?.x.knobs && ["chest", "nightstand", "wardrobe", "cabinet", "sideboard", "tv", "shoe", "wallcab", "kitchen", "mixed", "washstand", "sinkcab", "appliance"].includes(kind)) x.knobs = hint.x.knobs;if (kind === "chest" || kind === "nightstand") {const total = x.rows ?? (kind === "nightstand" ? (h >= 60 ? 2 : 1) : Math.min(6, Math.max(2, Math.round(h / 14))));if (kind === "chest" && total === 2 && w <= 60 && h <= 65) return finish("nightstand");diff --git a/scripts/ikea/slugs.json b/scripts/ikea/slugs.jsonindex 7e4b2a1..c3feed9 100644--- a/scripts/ikea/slugs.json+++ b/scripts/ikea/slugs.json@@ -182,6 +182,7 @@"ENHET|Base fr w shelves, 40 × 60 × 75 cm": "enhet-base-fr-w-shelves-40-x-60-x-75","ENHET|Base fr w shelves, 60 × 40 × 60 cm": "enhet-base-fr-w-shelves-60-x-40-x-60","ENHET|Base frame for washbasin, 60 × 40 × 60 cm": "enhet-base-frame-for-washbasin-60-x-40-x-60",+ "ENHET|High cabinet for fridge/freezer, 60 × 60 × 210 cm": "enhet-high-cabinet-for-fridge-freezer-60-x-60-x","ENHET|High cabinet with door, 30 × 32 × 180 cm": "enhet-high-cabinet-door-30-x-32-x-180","ENHET|Mirror cabinet with door, 40 × 17 × 75 cm": "enhet-mirror-cabinet-door-40-x-17-x-75","ENHET|Mirror cabinet with doors, 60 × 17 × 75 cm": "enhet-mirror-cabinet-doors-60-x-17-x-75",@@ -600,21 +601,51 @@"MARKUS|Office chair": "markus-office-chair","MARKUS|Office chair with armrests": "markus-office-chair-armrests","MATCHSPEL|Gaming chair": "matchspel-gaming-chair",+ "METOD / KNIVSHULT|Base cab f hob/2 fronts/3 drawers, 60 × 60 cm": "metod-knivshult-base-cab-f-hob-2-fronts-3-drawer",+ "METOD / KNIVSHULT|Base cab f hob/3 fronts/3 drawers, 60 × 60 cm": "metod-knivshult-base-cab-f-hob-3-fronts-3-drawer","METOD / KNIVSHULT|Base cab f sink+2 fronts/2 drawers, 60 × 60 cm": "metod-knivshult-base-cab-f-sink-2-fronts-2-drawe","METOD / KNIVSHULT|Base cab f sink+3 fronts/2 drawers, 80 × 60 cm": "metod-knivshult-base-cab-f-sink-3-fronts-2-drawe","METOD / KNIVSHULT|Base cab f TALLSJÖN sink, 60 × 60 cm": "metod-knivshult-base-cab-f-tallsjon-sink-60-x-60","METOD / KNIVSHULT|Base cab f TALLSJÖN sink, 80 × 60 cm": "metod-knivshult-base-cab-f-tallsjon-sink-80-x-60",+ "METOD / KNIVSHULT|Base cabinet f built-in appliances, 60 × 60 cm": "metod-knivshult-base-cabinet-f-built-in-applianc",+ "METOD / KNIVSHULT|Base cabinet for oven with drawer, 60 × 60 cm": "metod-knivshult-base-cabinet-for-oven-drawer-60","METOD / KNIVSHULT|Base cabinet with drawer/2 doors, 80 × 60 cm": "metod-knivshult-base-cabinet-drawer-2-doors-80-x","METOD / KNIVSHULT|Base cabinet with drawer/door, 40 × 60 cm": "metod-knivshult-base-cabinet-drawer-door-40-x-60","METOD / KNIVSHULT|Base cb f HAVSEN snk/3 frnts/2 drws, 60 × 60 cm": "metod-knivshult-base-cb-f-havsen-snk-3-frnts-2-d",+ "METOD / KNIVSHULT|Hi cab f ov w dr/2 frnt/1 m/1 h drw, 60 × 60 × 200 cm": "metod-knivshult-hi-cab-f-ov-w-dr-2-frnt-1-m-1-h",+ "METOD / KNIVSHULT|Hi cab f ov w dr/2 frnts/2 hi drwrs, 60 × 60 × 220 cm": "metod-knivshult-hi-cab-f-ov-w-dr-2-frnts-2-hi-dr",+ "METOD / KNIVSHULT|High cab f oven w door/3 drawers, 60 × 60 × 220 cm": "metod-knivshult-high-cab-f-oven-w-door-3-drawers",+ "METOD / KNIVSHULT|High cabinet f built-in appliances, 60 × 60 × 140 cm": "metod-knivshult-high-cabinet-f-built-in-applianc",+ "METOD / KNIVSHULT|High cabinet f built-in appliances, 60 × 60 × 200 cm": "metod-knivshult-high-cabinet-f-built-in-applianc-2",+ "METOD / KNIVSHULT|High cabinet f built-in appliances, 60 × 60 × 220 cm": "metod-knivshult-high-cabinet-f-built-in-applianc-3",+ "METOD / KNIVSHULT|High cabinet f built-in appliances, 60 × 60 × 240 cm": "metod-knivshult-high-cabinet-f-built-in-applianc-4",+ "METOD / KNIVSHULT|High cabinet f oven+door/2 drawers, 60 × 60 × 240 cm": "metod-knivshult-high-cabinet-f-oven-door-2-drawe",+ "METOD / KNIVSHULT|High cabinet w 2 drawers for oven, 60 × 60 × 140 cm": "metod-knivshult-high-cabinet-w-2-drawers-for-ove",+ "METOD / MAXIMERA|Base cab f hob/2 fronts/2 drawers, 60 × 60 cm": "metod-maximera-base-cab-f-hob-2-fronts-2-drawers",+ "METOD / MAXIMERA|Base cab f hob/2 fronts/3 drawers, 80 × 60 cm": "metod-maximera-base-cab-f-hob-2-fronts-3-drawers",+ "METOD / MAXIMERA|Base cab f hob/3 fronts/3 drawers, 60 × 60 cm": "metod-maximera-base-cab-f-hob-3-fronts-3-drawers",+ "METOD / MAXIMERA|Base cab f hob/3 fronts/3 drawers, 80 × 60 cm": "metod-maximera-base-cab-f-hob-3-fronts-3-drawers-2","METOD / MAXIMERA|Base cab f sink+2 fronts/2 drawers, 60 × 60 cm": "metod-maximera-base-cab-f-sink-2-fronts-2-drawer","METOD / MAXIMERA|Base cab f sink+3 fronts/2 drawers, 60 × 60 cm": "metod-maximera-base-cab-f-sink-3-fronts-2-drawer","METOD / MAXIMERA|Base cab f sink+3 fronts/2 drawers, 80 × 60 cm": "metod-maximera-base-cab-f-sink-3-fronts-2-drawer-2","METOD / MAXIMERA|Base cab f TALLSJÖN sink, 60 × 60 cm": "metod-maximera-base-cab-f-tallsjon-sink-60-x-60","METOD / MAXIMERA|Base cab f TALLSJÖN sink, 80 × 60 cm": "metod-maximera-base-cab-f-tallsjon-sink-80-x-60",+ "METOD / MAXIMERA|Base cab for hob+oven w drawer, 60 × 60 cm": "metod-maximera-base-cab-for-hob-oven-w-drawer-60",+ "METOD / MAXIMERA|Base cabinet f built-in appliances, 60 × 60 cm": "metod-maximera-base-cabinet-f-built-in-appliance",+ "METOD / MAXIMERA|Base cabinet for oven with drawer, 60 × 60 cm": "metod-maximera-base-cabinet-for-oven-drawer-60-x","METOD / MAXIMERA|Base cabinet with drawer/2 doors, 80 × 60 cm": "metod-maximera-base-cabinet-drawer-2-doors-80-x","METOD / MAXIMERA|Base cabinet with drawer/door, 60 × 60 cm": "metod-maximera-base-cabinet-drawer-door-60-x-60","METOD / MAXIMERA|Base cb f HAVSEN snk/3 frnts/2 drws, 60 × 60 cm": "metod-maximera-base-cb-f-havsen-snk-3-frnts-2-dr",+ "METOD / MAXIMERA|Hi cab f ov w dr/2 frnt/1 m/1 h drw, 60 × 60 × 220 cm": "metod-maximera-hi-cab-f-ov-w-dr-2-frnt-1-m-1-h-d",+ "METOD / MAXIMERA|Hi cab f ov w dr/2 frnts/2 hi drwrs, 60 × 60 × 220 cm": "metod-maximera-hi-cab-f-ov-w-dr-2-frnts-2-hi-drw",+ "METOD / MAXIMERA|High cab f oven w door/3 drawers, 60 × 60 × 240 cm": "metod-maximera-high-cab-f-oven-w-door-3-drawers",+ "METOD / MAXIMERA|High cabinet f built-in appliances, 60 × 60 × 140 cm": "metod-maximera-high-cabinet-f-built-in-appliance",+ "METOD / MAXIMERA|High cabinet f built-in appliances, 60 × 60 × 200 cm": "metod-maximera-high-cabinet-f-built-in-appliance-2",+ "METOD / MAXIMERA|High cabinet f built-in appliances, 60 × 60 × 220 cm": "metod-maximera-high-cabinet-f-built-in-appliance-3",+ "METOD / MAXIMERA|High cabinet f built-in appliances, 60 × 60 × 240 cm": "metod-maximera-high-cabinet-f-built-in-appliance-4",+ "METOD / MAXIMERA|High cabinet f oven+door/2 drawers, 60 × 60 × 200 cm": "metod-maximera-high-cabinet-f-oven-door-2-drawer",+ "METOD / MAXIMERA|High cabinet f oven+door/2 drawers, 60 × 60 × 240 cm": "metod-maximera-high-cabinet-f-oven-door-2-drawer-2",+ "METOD / MAXIMERA|High cabinet w 2 drawers for oven, 60 × 60 × 140 cm": "metod-maximera-high-cabinet-w-2-drawers-for-oven","METOD|Base cab f HAVSEN double bowl sink, 80 × 60 cm": "metod-base-cab-f-havsen-double-bowl-sink-80-x-60","METOD|Base cab f HAVSEN single bowl sink, 60 × 60 cm": "metod-base-cab-f-havsen-single-bowl-sink-60-x-60","METOD|Base cab f sink/waste sorting, 40 × 60 cm": "metod-base-cab-f-sink-waste-sorting-40-x-60",@@ -627,13 +658,30 @@"METOD|Base cabinet with shelves, 60 × 60 cm": "metod-base-cabinet-shelves-60-x-60","METOD|Base cabinet with shelves/2 doors, 80 × 60 cm": "metod-base-cabinet-shelves-2-doors-80-x-60","METOD|Base cb f built-in appliances/sink, 60 × 60 × 80 cm": "metod-base-cb-f-built-in-appliances-sink-60-x-60",+ "METOD|Hi cab f fridge or freezer w 2 drs, 60 × 60 × 200 cm": "metod-hi-cab-f-fridge-or-freezer-w-2-drs-60-x-60",+ "METOD|High cab f fridge or freezer w door, 60 × 60 × 200 cm": "metod-high-cab-f-fridge-or-freezer-w-door-60-x-6",+ "METOD|High cab f fridge/freezer w 3 doors, 60 × 60 × 220 cm": "metod-high-cab-f-fridge-freezer-w-3-doors-60-x-6",+ "METOD|High cab f fridge/freezer w 3 doors, 60 × 60 × 240 cm": "metod-high-cab-f-fridge-freezer-w-3-doors-60-x-6-2",+ "METOD|High cab f micro w 2 doors/shelves, 60 × 60 × 220 cm": "metod-high-cab-f-micro-w-2-doors-shelves-60-x-60",+ "METOD|High cab f oven w 2 doors/shelves, 60 × 60 × 200 cm": "metod-high-cab-f-oven-w-2-doors-shelves-60-x-60",+ "METOD|High cab for fridge with 3 doors, 60 × 60 × 240 cm": "metod-high-cab-for-fridge-3-doors-60-x-60-x-240",+ "METOD|High cabinet f built-in appliances, 60 × 60 × 140 cm": "metod-high-cabinet-f-built-in-appliances-60-x-60",+ "METOD|High cabinet f built-in appliances, 60 × 60 × 200 cm": "metod-high-cabinet-f-built-in-appliances-60-x-60-2",+ "METOD|High cabinet f built-in appliances, 60 × 60 × 220 cm": "metod-high-cabinet-f-built-in-appliances-60-x-60-3",+ "METOD|High cabinet for fridge w 2 doors, 60 × 60 × 220 cm": "metod-high-cabinet-for-fridge-w-2-doors-60-x-60",+ "METOD|High cabinet for fridge/freezer, 60 × 60 × 140 cm": "metod-high-cabinet-for-fridge-freezer-60-x-60-x",+ "METOD|High cabinet for fridge/freezer, 60 × 60 × 200 cm": "metod-high-cabinet-for-fridge-freezer-60-x-60-x-2","METOD|High cabinet with shelves, 40 × 37 × 200 cm": "metod-high-cabinet-shelves-40-x-37-x-200","METOD|High cabinet with shelves, 60 × 60 × 140 cm": "metod-high-cabinet-shelves-60-x-60-x-140","METOD|High cabinet with shelves/2 doors, 60 × 60 × 220 cm": "metod-high-cabinet-shelves-2-doors-60-x-60-x-220","METOD|High cabinet, 60 × 60 × 200 cm": "metod-high-cabinet-60-x-60-x-200","METOD|Sink cabinet with organiser, 60 × 60 × 80 cm": "metod-sink-cabinet-organiser-60-x-60-x-80",+ "METOD|Top cabinet for fridge/freezer, 60 × 40 cm": "metod-top-cabinet-for-fridge-freezer-60-x-40","METOD|Top cabinet, 40 × 40 cm": "metod-top-cabinet-40-x-40","METOD|Top cabinet, 40 × 60 × 40 cm": "metod-top-cabinet-40-x-60-x-40",+ "METOD|Wall cabinet f b-in extractor hood, 60 × 37 × 60 cm": "metod-wall-cabinet-f-b-in-extractor-hood-60-x-37",+ "METOD|Wall cabinet for microwave oven, 60 × 100 cm": "metod-wall-cabinet-for-microwave-oven-60-x-100",+ "METOD|Wall cabinet for microwave oven, 60 × 80 cm": "metod-wall-cabinet-for-microwave-oven-60-x-80","METOD|Wall cabinet w shelves/2 glass drs, 40 × 100 cm": "metod-wall-cabinet-w-shelves-2-glass-drs-40-x-10","METOD|Wall cabinet w shelves/2 glass drs, 60 × 80 cm": "metod-wall-cabinet-w-shelves-2-glass-drs-60-x-80","METOD|Wall cabinet w shelves/glass door, 30 × 80 cm": "metod-wall-cabinet-w-shelves-glass-door-30-x-80",@@ -646,6 +694,11 @@"METOD|Wall cabinet with shelves/2 doors, 80 × 80 cm": "metod-wall-cabinet-shelves-2-doors-80-x-80","METOD|Wall cabinet, 60 × 37 × 60 cm": "metod-wall-cabinet-60-x-37-x-60","METOD|Wall cabinet, 60 × 40 cm": "metod-wall-cabinet-60-x-40",+ "METOD|Wall cb f extr hood w shlf/door, 60 × 100 cm": "metod-wall-cb-f-extr-hood-w-shlf-door-60-x-100",+ "METOD|Wall cb f extr hood w shlf/door, 60 × 60 cm": "metod-wall-cb-f-extr-hood-w-shlf-door-60-x-60",+ "METOD|Wall cb f extr hood w shlf/door, 60 × 80 cm": "metod-wall-cb-f-extr-hood-w-shlf-door-60-x-80",+ "METOD|Wall cb f extr hood w shlf/door, 80 × 100 cm": "metod-wall-cb-f-extr-hood-w-shlf-door-80-x-100",+ "METOD|Wall cb f extr hood w shlf/door, 80 × 80 cm": "metod-wall-cb-f-extr-hood-w-shlf-door-80-x-80","MICKE|Desk, 142 × 50 cm": "micke-desk-142-x-50","MICKE|Desk, 73 × 50 cm": "micke-desk-73-x-50","MILLBERGET|Swivel chair": "millberget-swivel-chair",diff --git a/src/components/guide/CoverPanel.tsx b/src/components/guide/CoverPanel.tsxindex e784c08..b3e74bc 100644--- a/src/components/guide/CoverPanel.tsx+++ b/src/components/guide/CoverPanel.tsx@@ -245,7 +245,7 @@ function chipLabels(labels: string[]) {/** IKEA's shorthand in its type names, as words. */const SHORTHAND: [RegExp, string][] = [- [/\s*\+\s*/g, " with "],+ [/\s*\+\s*/g, " and "],[/\b(cab|cb)\b/gi, "cabinet"],[/\bhi\b/gi, "high"],[/\bf\b/g, "for"],@@ -259,6 +259,9 @@ const SHORTHAND: [RegExp, string][] = [[/\bfrnt\b/g, "front"],[/\b(drws|drwrs)\b/g, "drawers"],[/\bdrw\b/g, "drawer"],+ [/\bdr\b/g, "door"],+ [/\b(\d) m\b/g, "$1 medium"],+ [/\b(\d) h\b/g, "$1 high"],[/\bshlf\b/g, "shelf"],[/\bshlvs?\b/g, "shelves"],];diff --git a/src/data/ikea-items.ts b/src/data/ikea-items.tsindex 486a7a6..8ad03ce 100644--- a/src/data/ikea-items.ts+++ b/src/data/ikea-items.ts@@ -202,6 +202,7 @@ enhet-base-fr-w-shelves-40-x-60-x-75|00448953 20448952 10448976 30448975enhet-base-fr-w-shelves-60-x-40-x-60|60448974 80448973 40448951 60448950enhet-base-frame-for-washbasin-60-x-40-x-60|40464470 20464471enhet-high-cabinet-door-30-x-32-x-180|10623036 30632054+enhet-high-cabinet-for-fridge-freezer-60-x-60-x|30514197enhet-mirror-cabinet-60-x-17-x-75|59336519 99336517 19336516 79336518enhet-mirror-cabinet-door-40-x-17-x-75|30623040enhet-mirror-cabinet-doors-60-x-17-x-75|50623044 80623047@@ -681,32 +682,79 @@ metod-base-cabinet-for-sink-60-x-60|19507136 59589333 49455131 09486846 89589020metod-base-cabinet-shelves-2-doors-80-x-60|49507125 89507133 79465812 69507129 09538039 89517491 89458750metod-base-cabinet-shelves-60-x-60|49589630 79507124 19507122 99487295 89507128 89473369 59466394metod-base-cb-f-built-in-appliances-sink-60-x-60|70213569 80591678 60591679 50215475+metod-hi-cab-f-fridge-or-freezer-w-2-drs-60-x-60|79304032 99628304 99588708 99586035 99585936 99509438 99465986 99556608 89518179 69588795 39473526+metod-high-cab-f-fridge-freezer-w-3-doors-60-x-6|49587928 39473531 09463703 09462628 99605388 99604529 99577291+metod-high-cab-f-fridge-freezer-w-3-doors-60-x-6-2|79605110 99585917 99566221 99465062 89558293 89556835 89539290+metod-high-cab-f-fridge-or-freezer-w-door-60-x-6|99589425 59601274 49486415 19538147 09920706 99924781 99409306+metod-high-cab-f-micro-w-2-doors-shelves-60-x-60|79507379 99507378 99486408 69588960 59587763 89517735 79455484+metod-high-cab-f-oven-w-2-doors-shelves-60-x-60|49460632 19507377 99624612 99605449 99601154 99589005 99577413+metod-high-cab-for-fridge-3-doors-60-x-60-x-240|99466194 99600814 89628309 89628192 89588006 89517537 79605167metod-high-cabinet-60-x-60-x-200|60212565 90212559 90212564 70212560 10212558 50212561 50591694+metod-high-cabinet-f-built-in-appliances-60-x-60|99616589 99616551 99616527 99616513 89616575 89616561 89616467+metod-high-cabinet-f-built-in-appliances-60-x-60-2|90213568 70591688 50213570 20385474 90591687 30591732+metod-high-cabinet-f-built-in-appliances-60-x-60-3|89587525 89507388 69473544 49486241 39460270 39459950 99624396+metod-high-cabinet-for-fridge-freezer-60-x-60-x|99426565 99624551 99565518 99558966 99557113 99538049 89628173+metod-high-cabinet-for-fridge-freezer-60-x-60-x-2|49507347 89426556 79587639 59588531 39589555 19587755 99589374+metod-high-cabinet-for-fridge-w-2-doors-60-x-60|19507358 99628163 99605411 99565783 99565491 99473533 99461851metod-high-cabinet-shelves-2-doors-60-x-60-x-220|09507311 29507310 19468936 69538753 99457241 79456817 49457597metod-high-cabinet-shelves-40-x-37-x-200|89507312 89507307 69507313 39461991 69538965 49487467 39455669metod-high-cabinet-shelves-60-x-60-x-140|79507317 29467658 19509418 59465002 09466259 99628219 99586484+metod-knivshult-base-cab-f-hob-2-fronts-3-drawer|99587389 99587153 89589100 89589015 89588902 69588031 59588833+metod-knivshult-base-cab-f-hob-3-fronts-3-drawer|89588247 79587559 99588925 99587718 79588064 59589451 59588611metod-knivshult-base-cab-f-sink-2-fronts-2-drawe|69588366 89588290 39586745 99589623 99589576 99588906 89587747metod-knivshult-base-cab-f-sink-3-fronts-2-drawe|99588591 89589077 89588412 89587865 89587785 59588786 59587678metod-knivshult-base-cab-f-tallsjon-sink-60-x-60|99587704 79589520 49587018 39588457 19588694 19587963 09589651 79589431 79587781 69588984 59588102 39587962 29589235metod-knivshult-base-cab-f-tallsjon-sink-80-x-60|79588224 69588333 69586843 59587414 49587674 09588152metod-knivshult-base-cabinet-drawer-2-doors-80-x|89586960 59588244 99587068 89589529 79588021 69588168 59589007metod-knivshult-base-cabinet-drawer-door-40-x-60|59589470 99588845 99588789 79589681 79587955 29589396 29587199+metod-knivshult-base-cabinet-f-built-in-applianc|99613562 89613567 79613563 59613564 29613565 09613566+metod-knivshult-base-cabinet-for-oven-drawer-60|99586766 89586955 69587022 89587276 79587229metod-knivshult-base-cb-f-havsen-snk-3-frnts-2-d|99586752 89587224 79589539 69587965 69587098+metod-knivshult-hi-cab-f-ov-w-dr-2-frnt-1-m-1-h|99588954 79589916 79588808 69589238 59588606 49589828 49589381+metod-knivshult-hi-cab-f-ov-w-dr-2-frnts-2-hi-dr|89588855 89588940 89588313 89587064 79587130 59589347 59588423+metod-knivshult-high-cab-f-oven-w-door-3-drawers|99588138 99586945 99586747 89588676 89588087 89586875 79589902+metod-knivshult-high-cabinet-f-built-in-applianc|69589714 69588106 59587720 49587198 39589329 29587905+metod-knivshult-high-cabinet-f-built-in-applianc-2|89615608 69615609 49615610 29615611 29615606 09615607 99616283 79616284 59616280 49616285 39616281 19616282+metod-knivshult-high-cabinet-f-built-in-applianc-3|99587803 79589327 79588484 69587734 69587606 59587126 49587834 99616650 79616651 59616652 39616653 19616654 19616649 99617027 89617023 79617028 69617024 39617025 19617026+metod-knivshult-high-cabinet-f-built-in-applianc-4|89616801 69616802 49616803 49616799 29616804 09616800 79617165 69617161 59617166 49617162 29617163 09617164+metod-knivshult-high-cabinet-f-oven-door-2-drawe|99589213 89587672 79587738 59589578 59588932 59587555+metod-knivshult-high-cabinet-w-2-drawers-for-ove|99589595 59589842 39587014 29587986 19589820 19587294+metod-maximera-base-cab-f-hob-2-fronts-2-drawers|99486314 29130671 09473269 99627899 99558725 99557306+metod-maximera-base-cab-f-hob-2-fronts-3-drawers|29487473 99601781 99578969 99576611 99556590 99538129 99517363+metod-maximera-base-cab-f-hob-3-fronts-3-drawers|99253946 79330267 79305475 59253948 19257203+metod-maximera-base-cab-f-hob-3-fronts-3-drawers-2|99627917 99624669 99606298 99574594 99518089 99110127 99110090metod-maximera-base-cab-f-sink-2-fronts-2-drawer|39517653 99605996 99601390 99558971 99537907 99509160 99504049metod-maximera-base-cab-f-sink-3-fronts-2-drawer|89473265 59624505 39486958 99586441 99578771 99537993 99506963 09577422 99600277 99579011 99557472 99538233 99538105 99304045metod-maximera-base-cab-f-sink-3-fronts-2-drawer-2|99310008metod-maximera-base-cab-f-tallsjon-sink-60-x-60|99550649 99550480 99550239 89557590 89550089 79550419 79550339 99600748 99576593metod-maximera-base-cab-f-tallsjon-sink-80-x-60|19550318 99606199 99550828 99550116 89558542 89550305 89550126+metod-maximera-base-cab-for-hob-oven-w-drawer-60|29506971 79168973 39517634 19504053 99558589 89539148 89498223metod-maximera-base-cabinet-drawer-2-doors-80-x|79506997 79473317 59507021 09517414 99486979 79565680 79509298metod-maximera-base-cabinet-drawer-door-60-x-60|59473295 89504083 89473307 59539395 99556571 89507005 89486687+metod-maximera-base-cabinet-f-built-in-appliance|99613618 59613597 99613699 99613661 99613656 99613642 99613576+metod-maximera-base-cabinet-for-oven-drawer-60-x|79486923 19109991 99624240 99578813 89600225 79557425 69168563metod-maximera-base-cb-f-havsen-snk-3-frnts-2-dr|99504092 99624631 99565556 99509259+metod-maximera-hi-cab-f-ov-w-dr-2-frnt-1-m-1-h-d|89461639 69463804 69456653+metod-maximera-hi-cab-f-ov-w-dr-2-frnts-2-hi-drw|99586257 99492367 99470092 99468452 99459424 99458274 89606388+metod-maximera-high-cab-f-oven-w-door-3-drawers|99459966 99624424 99565392 99556769 99517155 99507062 99492621+metod-maximera-high-cabinet-f-built-in-appliance|99538025 99509532 89518061 79578946 79558255 79557171 69254061+metod-maximera-high-cabinet-f-built-in-appliance-2|89507053 09466848 99606038 99605864 99604195 99565537 99538959 29615649 89615689 29615710 99615740 99615735 99615716 99615641 99616396 69616393 99616419 99616382 99616344 99616315 89616405+metod-maximera-high-cabinet-f-built-in-appliance-3|49616737 09616715 99616787 99616768 99616749 99616711 99616674 99617126 99617112 99617094 89617160 89617155 89617103 79617146+metod-maximera-high-cabinet-f-built-in-appliance-4|99616914 99616891 99616886 89616877 89616858 89616815 79616873 99617268 99617225 99617188 99617174 89617283 89617235 89617216+metod-maximera-high-cabinet-f-oven-door-2-drawer|89507048 59565841 49465998 99462011 89624603 89606312+metod-maximera-high-cabinet-f-oven-door-2-drawer-2|49557380 99577026 99458491 89517274 89465920 79586395 79468783+metod-maximera-high-cabinet-w-2-drawers-for-oven|99565542 99558693 89604105 89538554 89486569 89473350metod-sink-cabinet-organiser-60-x-60-x-80|89656316metod-top-cabinet-40-x-40|99518027 99456251 59539197 49464201 39507296 39473611 99587940metod-top-cabinet-40-x-60-x-40|60224078 10591733+metod-top-cabinet-for-fridge-freezer-60-x-40|19537992 19507297 99473613 99462153 99459933 99457458 79589412metod-wall-cabinet-2-doors-80-x-40|79507261 99473463 29611929 39469398 19518045 09588703 39587165metod-wall-cabinet-2-glass-doors-80-x-40|79455568 89473473 89466707 59487481 59463041 49601156metod-wall-cabinet-60-x-37-x-60|80205535 30205528 70205526 50205532 50591726 10205534 80252112metod-wall-cabinet-60-x-40|29507254 79589025 69507247 79457416 59473455 49467657 39467525+metod-wall-cabinet-f-b-in-extractor-hood-60-x-37|50547639 30547640 90547642 10547641 20592218 60592221 70547643+metod-wall-cabinet-for-microwave-oven-60-x-100|89588426 69487503 69456667 99538006 99509382 89576881 89463167+metod-wall-cabinet-for-microwave-oven-60-x-80|89507246 79454917 49486670 79586404 79458703 19566277 09588147metod-wall-cabinet-glass-door-40-x-40|89469838 69465233 39486411 99578733 89509349 69473469metod-wall-cabinet-shelves-2-doors-40-x-100|89507265 29539392 79605431 19587312 19462468 99606024 99605557metod-wall-cabinet-shelves-2-doors-80-x-80|39507263 19507264 79473464 49470023 49473465 39538405 99465972@@ -715,6 +763,11 @@ metod-wall-cabinet-shelves-60-x-80|39507258 59507257 59466681 99507255 79507256metod-wall-cabinet-w-shelves-2-glass-drs-40-x-10|89486376 79601824 79459199 79456214 69464573 59509360 39517417metod-wall-cabinet-w-shelves-2-glass-drs-60-x-80|79490562 59586853 39586854 19509357 09587237 89588407 89394980metod-wall-cabinet-w-shelves-glass-door-30-x-80|09589076 09587647 49394977 99490622 89589421 69394976 59518487+metod-wall-cb-f-extr-hood-w-shlf-door-60-x-100|89587422 99587657 99558551 99538803 89566434 79605737 79589266+metod-wall-cb-f-extr-hood-w-shlf-door-60-x-60|39505339 79587903 99558650 99519512 99505317 89505346 89505332+metod-wall-cb-f-extr-hood-w-shlf-door-60-x-80|99589883 99504474 99504450 89606289 89589143 89588662 89578842 99517075 89587771 69504545 59504541 99601564 99589369 99588459+metod-wall-cb-f-extr-hood-w-shlf-door-80-x-100|29504302 99589312 99537894 99504290 89604474 89587931 89566373+metod-wall-cb-f-extr-hood-w-shlf-door-80-x-80|99611959 99565778 99538493 99519098 99504426 89587479 89587318micke-desk-105-x-50|80213074 10244743 09903014micke-desk-142-x-50|90214308 60244745micke-desk-73-x-50|30213076 20244747diff --git a/src/data/ikea-rows.ts b/src/data/ikea-rows.tsindex 99d5e36..e7fbcc4 100644--- a/src/data/ikea-rows.ts+++ b/src/data/ikea-rows.ts@@ -174,6 +174,7 @@ EKTORP|chaise|3-seat sofa with chaise longue|218|88|156|seats=3,arms=wide,chaiseEKTORP|corner|Corner sofa, 4-seat|228|88|166|seats=4,arms=wide,corner=left,sd=88EKTORP|sofa|2-seat sofa|170|85|92|seats=2ELDBERGET / MALSKÄR|office|Swivel chair|60|105|64|arms=none+ENHET|appliance|High cabinet for fridge/freezer, 60 × 60 × 210 cm|60|210|60|use=fridge,z=g+o@40ENHET|cabinet|High cabinet with door, 30 × 32 × 180 cm|30|180|32|doors=1ENHET|kitchen|Base fr w shelves, 40 × 60 × 75 cm|40|75|60|doors=0ENHET|kitchen|Base fr w shelves, 60 × 40 × 60 cm|60|60|40|doors=0@@ -601,6 +602,28 @@ MARIEDAMM|dining|Table, 180 × 100 cm|180|74|100MARKUS|office|Office chair|64|128|64|arms=slimMARKUS|office|Office chair with armrests|64|128|64|arms=slimMATCHSPEL|office|Gaming chair|64|128|64|arms=slim,seatH=50+METOD|appliance|Top cabinet for fridge/freezer, 60 × 40 cm|60|40|60|use=fridge,z=d1,hung=1+METOD|appliance|Wall cabinet f b-in extractor hood, 60 × 37 × 60 cm|60|60|37|use=hood,z=o,hung=1+METOD|appliance|Wall cb f extr hood w shlf/door, 60 × 60 cm|60|60|37|use=hood,z=d1s1,hung=1+METOD|appliance|Wall cabinet for microwave oven, 60 × 80 cm|60|80|37|use=microwave,z=g@40+d1,hung=1+METOD|appliance|Wall cb f extr hood w shlf/door, 60 × 80 cm|60|80|37|use=hood,z=d1s1,hung=1+METOD|appliance|Wall cabinet for microwave oven, 60 × 100 cm|60|100|37|use=microwave,z=g@40+d1,hung=1+METOD|appliance|Wall cb f extr hood w shlf/door, 60 × 100 cm|60|100|37|use=hood,z=d1s1,hung=1+METOD|appliance|High cabinet f built-in appliances, 60 × 60 × 140 cm|60|140|60|use=appliance,z=d1@80+g@60+METOD|appliance|High cabinet for fridge/freezer, 60 × 60 × 140 cm|60|140|60|use=fridge,z=d1+d1@60+METOD|appliance|Hi cab f fridge or freezer w 2 drs, 60 × 60 × 200 cm|60|200|60|use=fridge,z=d1+d1@60+METOD|appliance|High cab f fridge or freezer w door, 60 × 60 × 200 cm|60|200|60|use=fridge,z=d1+METOD|appliance|High cab f oven w 2 doors/shelves, 60 × 60 × 200 cm|60|200|60|use=oven,z=d1s1@80+g@60+d1s1+METOD|appliance|High cabinet f built-in appliances, 60 × 60 × 200 cm|60|200|60|use=appliance,z=o@80+g@60+o||metod-high-cabinet-f-built-in-appliances-60-x-60-2+METOD|appliance|High cabinet for fridge/freezer, 60 × 60 × 200 cm|60|200|60|use=fridge,z=d1+d1@60||metod-high-cabinet-for-fridge-freezer-60-x-60-x-2+METOD|appliance|High cab f fridge/freezer w 3 doors, 60 × 60 × 220 cm|60|220|60|use=fridge,z=d1+d1+d1@60+METOD|appliance|High cab f micro w 2 doors/shelves, 60 × 60 × 220 cm|60|220|60|use=microwave,z=d1s2@100+g@40+d1s1+METOD|appliance|High cabinet f built-in appliances, 60 × 60 × 220 cm|60|220|60|use=appliance,z=d1@80+g@60+d1||metod-high-cabinet-f-built-in-appliances-60-x-60-3+METOD|appliance|High cabinet for fridge w 2 doors, 60 × 60 × 220 cm|60|220|60|use=fridge,z=d1+d1@60+METOD|appliance|High cab f fridge/freezer w 3 doors, 60 × 60 × 240 cm|60|240|60|use=fridge,z=d1+d1+d1@60||metod-high-cab-f-fridge-freezer-w-3-doors-60-x-6-2+METOD|appliance|High cab for fridge with 3 doors, 60 × 60 × 240 cm|60|240|60|use=fridge,z=d1+d1+d1@60+METOD|appliance|Wall cb f extr hood w shlf/door, 80 × 80 cm|80|80|37|use=hood,z=d1s1,hung=1+METOD|appliance|Wall cb f extr hood w shlf/door, 80 × 100 cm|80|100|37|use=hood,z=d1s1,hung=1METOD|kitchen|High cabinet with shelves, 40 × 37 × 200 cm|40|200|37|doors=0METOD|kitchen|Base cabinet with shelves, 60 × 60 cm|60|80|60|doors=0METOD|kitchen|High cabinet with shelves, 60 × 60 × 140 cm|60|140|60|doors=0@@ -632,6 +655,19 @@ METOD|wallcab|Wall cabinet with shelves, 60 × 80 cm|60|80|35|doors=0METOD|wallcab|Wall cabinet with 2 doors, 80 × 40 cm|80|40|35METOD|wallcab|Wall cabinet with 2 glass doors, 80 × 40 cm|80|40|35METOD|wallcab|Wall cabinet with shelves/2 doors, 80 × 80 cm|80|80|35+METOD / KNIVSHULT|appliance|Base cab f hob/2 fronts/3 drawers, 60 × 60 cm|60|80|60|use=hob,z=r2+METOD / KNIVSHULT|appliance|Base cab f hob/3 fronts/3 drawers, 60 × 60 cm|60|80|60|use=hob,z=r3+METOD / KNIVSHULT|appliance|Base cabinet f built-in appliances, 60 × 60 cm|60|80|60|use=appliance,z=r1@20+g@60+METOD / KNIVSHULT|appliance|Base cabinet for oven with drawer, 60 × 60 cm|60|80|60|use=oven,z=r1@20+g@60+METOD / KNIVSHULT|appliance|High cabinet f built-in appliances, 60 × 60 × 140 cm|60|140|60|use=appliance,z=r2@80+g@60+METOD / KNIVSHULT|appliance|High cabinet w 2 drawers for oven, 60 × 60 × 140 cm|60|140|60|use=oven,z=r2@80+g@60+METOD / KNIVSHULT|appliance|Hi cab f ov w dr/2 frnt/1 m/1 h drw, 60 × 60 × 200 cm|60|200|60|use=oven,z=r2@80+g@60+d1+METOD / KNIVSHULT|appliance|High cabinet f built-in appliances, 60 × 60 × 200 cm|60|200|60|use=appliance,z=r2@80+g@60+d1||metod-knivshult-high-cabinet-f-built-in-applianc-2+METOD / KNIVSHULT|appliance|Hi cab f ov w dr/2 frnts/2 hi drwrs, 60 × 60 × 220 cm|60|220|60|use=oven,z=r2@80+g@60+d1+METOD / KNIVSHULT|appliance|High cab f oven w door/3 drawers, 60 × 60 × 220 cm|60|220|60|use=oven,z=r3@80+g@60+d1+METOD / KNIVSHULT|appliance|High cabinet f built-in appliances, 60 × 60 × 220 cm|60|220|60|use=appliance,z=r2@80+g@60+d1||metod-knivshult-high-cabinet-f-built-in-applianc-3+METOD / KNIVSHULT|appliance|High cabinet f built-in appliances, 60 × 60 × 240 cm|60|240|60|use=appliance,z=r2@80+g@60+d1||metod-knivshult-high-cabinet-f-built-in-applianc-4+METOD / KNIVSHULT|appliance|High cabinet f oven+door/2 drawers, 60 × 60 × 240 cm|60|240|60|use=oven,z=r2@80+g@60+d1METOD / KNIVSHULT|mixed|Base cabinet with drawer/door, 40 × 60 cm|40|80|60|rows=1,doors=1,dtop=1METOD / KNIVSHULT|mixed|Base cabinet with drawer/2 doors, 80 × 60 cm|80|80|60|rows=1,doors=2,dtop=1METOD / KNIVSHULT|sinkcab|Base cab f sink+2 fronts/2 drawers, 60 × 60 cm|60|80|60|z=r2@@ -639,6 +675,23 @@ METOD / KNIVSHULT|sinkcab|Base cab f TALLSJÖN sink, 60 × 60 cm|60|80|60|z=r1@6METOD / KNIVSHULT|sinkcab|Base cb f HAVSEN snk/3 frnts/2 drws, 60 × 60 cm|60|80|60|z=r2@60+a@20METOD / KNIVSHULT|sinkcab|Base cab f sink+3 fronts/2 drawers, 80 × 60 cm|80|80|60|z=r2@60+f@20METOD / KNIVSHULT|sinkcab|Base cab f TALLSJÖN sink, 80 × 60 cm|80|80|60|z=r1@60+f@20+METOD / MAXIMERA|appliance|Base cab f hob/2 fronts/2 drawers, 60 × 60 cm|60|80|60|use=hob,z=r2+METOD / MAXIMERA|appliance|Base cab f hob/3 fronts/3 drawers, 60 × 60 cm|60|80|60|use=hob,z=r3+METOD / MAXIMERA|appliance|Base cab for hob+oven w drawer, 60 × 60 cm|60|80|60|use=ovenhob,z=r1@20+g@60+METOD / MAXIMERA|appliance|Base cabinet f built-in appliances, 60 × 60 cm|60|80|60|use=appliance,z=r1@20+g@60+METOD / MAXIMERA|appliance|Base cabinet for oven with drawer, 60 × 60 cm|60|80|60|use=oven,z=r1@20+g@60+METOD / MAXIMERA|appliance|High cabinet f built-in appliances, 60 × 60 × 140 cm|60|140|60|use=appliance,z=r2@80+g@60+METOD / MAXIMERA|appliance|High cabinet w 2 drawers for oven, 60 × 60 × 140 cm|60|140|60|use=oven,z=r2@80+g@60+METOD / MAXIMERA|appliance|High cabinet f built-in appliances, 60 × 60 × 200 cm|60|200|60|use=appliance,z=r2@80+g@60+d1||metod-maximera-high-cabinet-f-built-in-appliance-2+METOD / MAXIMERA|appliance|High cabinet f oven+door/2 drawers, 60 × 60 × 200 cm|60|200|60|use=oven,z=r2@80+g@60+d1+METOD / MAXIMERA|appliance|Hi cab f ov w dr/2 frnt/1 m/1 h drw, 60 × 60 × 220 cm|60|220|60|use=oven,z=r2@80+g@60+d1+METOD / MAXIMERA|appliance|Hi cab f ov w dr/2 frnts/2 hi drwrs, 60 × 60 × 220 cm|60|220|60|use=oven,z=r2@80+g@60+d1+METOD / MAXIMERA|appliance|High cabinet f built-in appliances, 60 × 60 × 220 cm|60|220|60|use=appliance,z=r2@80+g@60+d1||metod-maximera-high-cabinet-f-built-in-appliance-3+METOD / MAXIMERA|appliance|High cab f oven w door/3 drawers, 60 × 60 × 240 cm|60|240|60|use=oven,z=r3@80+g@60+d1+METOD / MAXIMERA|appliance|High cabinet f built-in appliances, 60 × 60 × 240 cm|60|240|60|use=appliance,z=r2@80+g@60+d1||metod-maximera-high-cabinet-f-built-in-appliance-4+METOD / MAXIMERA|appliance|High cabinet f oven+door/2 drawers, 60 × 60 × 240 cm|60|240|60|use=oven,z=r2@80+g@60+d1||metod-maximera-high-cabinet-f-oven-door-2-drawer-2+METOD / MAXIMERA|appliance|Base cab f hob/2 fronts/3 drawers, 80 × 60 cm|80|80|60|use=hob,z=r2+METOD / MAXIMERA|appliance|Base cab f hob/3 fronts/3 drawers, 80 × 60 cm|80|80|60|use=hob,z=r3||metod-maximera-base-cab-f-hob-3-fronts-3-drawers-2METOD / MAXIMERA|mixed|Base cabinet with drawer/door, 60 × 60 cm|60|80|60|rows=1,doors=1,dtop=1METOD / MAXIMERA|mixed|Base cabinet with drawer/2 doors, 80 × 60 cm|80|80|60|rows=1,doors=2,dtop=1METOD / MAXIMERA|sinkcab|Base cab f sink+2 fronts/2 drawers, 60 × 60 cm|60|80|60|z=r2diff --git a/src/lib/plan/fitted.ts b/src/lib/plan/fitted.tsindex ba2e9f0..2ff720a 100644--- a/src/lib/plan/fitted.ts+++ b/src/lib/plan/fitted.ts@@ -414,7 +414,7 @@ export function buildFitted(b: PlanBuilder, s: ProductSpec) {const list: FitOpts[] = doors.map((d) => {const x = d.x - d.sgn * (d.dw / 2 - 40);// a wall cabinet opens from the bottom edge, a base cabinet from the top, a tall door at hand height- const y = wall && !fit.hangFirst ? d.lo + 80 : clamp(1000, d.lo + 80, d.lo + d.dh - 80);+ const y = wall && !fit.hangFirst ? d.lo + 110 : clamp(1000, d.lo + 110, d.lo + d.dh - 110);return { on: d.key, at: [x, y, D / 2 + t], dir: [0, 0, -1], hole: false, twist: bar ? Math.PI / 2 : 0 };});for (const k of [...drawers.map((d) => d.front), ...fronts]) list.push({ on: k, at: [0, b.partItem(k).final.pos[1], D / 2 + t], dir: [0, 0, -1], hole: false });diff --git a/src/lib/products.ts b/src/lib/products.tsindex da92787..2046825 100644--- a/src/lib/products.ts+++ b/src/lib/products.ts@@ -51,7 +51,8 @@ export type Kind =| "section"| "gateleg"| "washstand"- | "sinkcab";+ | "sinkcab"+ | "appliance";export type X = {rows?: number;@@ -264,7 +265,7 @@ const MIN: Record<Kind, number> = {cube: 40, bookcase: 50, open: 40, chest: 90, nightstand: 40, desk: 25, coffee: 20, side: 15, dining: 40,bed: 100, wardrobe: 120, cabinet: 60, sideboard: 80, tv: 60, shoe: 45, chair: 25, stool: 12, bench: 20, sofa: 40, armchair: 30,wallshelf: 25, wallcab: 40, kitchen: 50, trolley: 25, bar: 35, console: 30, kidstable: 15, kidschair: 20,- office: 20, chaise: 55, corner: 70, cot: 35, bunk: 90, loft: 75, dropleaf: 40, daybed: 60, mixed: 50, sliding: 110, slidecab: 60, bookrow: 120, cabrow: 120, section: 25, gateleg: 50, washstand: 35, sinkcab: 45,+ office: 20, chaise: 55, corner: 70, cot: 35, bunk: 90, loft: 75, dropleaf: 40, daybed: 60, mixed: 50, sliding: 110, slidecab: 60, bookrow: 120, cabrow: 120, section: 25, gateleg: 50, washstand: 35, sinkcab: 45, appliance: 50,};const CATEGORY: Record<Kind, string> = {@@ -273,7 +274,7 @@ const CATEGORY: Record<Kind, string> = {cabinet: "Cabinet", sideboard: "Sideboard", tv: "TV bench", shoe: "Shoe cabinet", chair: "Chair", stool: "Stool",bench: "Bench", sofa: "Sofa", armchair: "Armchair", wallshelf: "Wall shelf", wallcab: "Wall cabinet", kitchen: "Kitchen cabinet",trolley: "Trolley", bar: "Bar table", console: "Console table", kidstable: "Children's table", kidschair: "Children's chair",- office: "Office chair", chaise: "Sofa with chaise longue", corner: "Corner sofa", cot: "Cot", bunk: "Bunk bed", loft: "Loft bed", dropleaf: "Drop-leaf table", daybed: "Day-bed", mixed: "Cabinet with doors and drawers", sliding: "Wardrobe with sliding doors", slidecab: "Cabinet with sliding doors", bookrow: "Bookcase combination", cabrow: "Storage combination", section: "Sofa section", gateleg: "Gateleg table", washstand: "Wash-stand", sinkcab: "Sink cabinet",+ office: "Office chair", chaise: "Sofa with chaise longue", corner: "Corner sofa", cot: "Cot", bunk: "Bunk bed", loft: "Loft bed", dropleaf: "Drop-leaf table", daybed: "Day-bed", mixed: "Cabinet with doors and drawers", sliding: "Wardrobe with sliding doors", slidecab: "Cabinet with sliding doors", bookrow: "Bookcase combination", cabrow: "Storage combination", section: "Sofa section", gateleg: "Gateleg table", washstand: "Wash-stand", sinkcab: "Sink cabinet", appliance: "Appliance cabinet",};export const KIND_ARCH: Record<Kind, Archetype> = {@@ -281,7 +282,7 @@ export const KIND_ARCH: Record<Kind, Archetype> = {side: "table", dining: "table", bed: "bed", wardrobe: "cabinet", cabinet: "cabinet", sideboard: "cabinet", tv: "cabinet",shoe: "cabinet", chair: "seat", stool: "seat", bench: "seat", sofa: "sofa", armchair: "sofa", wallshelf: "shelf", wallcab: "cabinet",kitchen: "cabinet", trolley: "table", bar: "table", console: "table", kidstable: "table", kidschair: "seat",- office: "seat", chaise: "sofa", corner: "sofa", cot: "bed", bunk: "bed", loft: "bed", dropleaf: "table", daybed: "bed", mixed: "cabinet", sliding: "cabinet", slidecab: "cabinet", bookrow: "shelf", cabrow: "cabinet", section: "sofa", gateleg: "table", washstand: "cabinet", sinkcab: "cabinet",+ office: "seat", chaise: "sofa", corner: "sofa", cot: "bed", bunk: "bed", loft: "bed", dropleaf: "table", daybed: "bed", mixed: "cabinet", sliding: "cabinet", slidecab: "cabinet", bookrow: "shelf", cabrow: "cabinet", section: "sofa", gateleg: "table", washstand: "cabinet", sinkcab: "cabinet", appliance: "cabinet",};const round = (x: X) => (x.round ? { round: true } : {});@@ -311,8 +312,17 @@ export function parseZones(z: string): FitZone[] {return out;}-const FIT_USE: Partial<Record<Kind, FitUse>> = { washstand: "basin", sinkcab: "sink" };-const FIT_FRONT: Partial<Record<Kind, string>> = { washstand: "r2", sinkcab: "d1@60+f@20" };+const FIT_USE: Partial<Record<Kind, FitUse>> = { washstand: "basin", sinkcab: "sink", appliance: "oven" };+const FIT_FRONT: Partial<Record<Kind, string>> = { washstand: "r2", sinkcab: "d1@60+f@20", appliance: "r2@80+g@60+d1" };+/** An appliance cabinet is named after what goes in it. */+const FIT_CATEGORY: Partial<Record<FitUse, string>> = {+ oven: "Oven cabinet",+ ovenhob: "Oven cabinet",+ fridge: "Fridge cabinet",+ hob: "Hob cabinet",+ microwave: "Microwave cabinet",+ hood: "Extractor hood cabinet",+};/** Cabinets built around a basin, a sink or an appliance: x.z is the front, x.use what goes in, x.basin a basin in the box. */function fitted(kind: Kind, base: Omit<ProductSpec, "source">, w: number, h: number, x: X): Omit<ProductSpec, "source"> {@@ -331,6 +341,7 @@ function fitted(kind: Kind, base: Omit<ProductSpec, "source">, w: number, h: num};return {...base,+ category: kind === "appliance" ? (FIT_CATEGORY[use] ?? CATEGORY.appliance) : base.category,minutes: x.min ?? MIN[kind] + 20 * drawers + 8 * doors + (tall ? 30 : 0) + (x.basin ? 10 : 0),people: tall || w > 90 ? 2 : 1,difficulty: drawers ? 3 : 2,@@ -452,6 +463,7 @@ export function specFor(kind: Kind, name: string, variant: string, w: number, h:}case "washstand":case "sinkcab":+ case "appliance":return fitted(kind, base, w, h, x);case "bookrow":case "cabrow": {@@ -498,5 +510,5 @@ export const KIND_DEFAULT_SIZE: Record<Kind, [number, number, number]> = {sideboard: [140, 85, 45], tv: [150, 50, 42], shoe: [60, 100, 28], chair: [44, 88, 50], stool: [35, 45, 35], bench: [100, 45, 38],sofa: [210, 85, 92], armchair: [75, 90, 80], wallshelf: [60, 60, 22], wallcab: [60, 60, 35], kitchen: [60, 80, 60], trolley: [50, 80, 40],bar: [120, 105, 60], console: [100, 79, 35], kidstable: [77, 48, 55], kidschair: [34, 60, 34],- office: [64, 105, 64], chaise: [226, 85, 160], corner: [233, 85, 171], cot: [130, 84, 68], bunk: [211, 160, 100], loft: [211, 195, 100], dropleaf: [134, 75, 80], daybed: [207, 83, 91], mixed: [80, 120, 40], sliding: [118, 200, 60], slidecab: [80, 110, 45], bookrow: [160, 202, 28], cabrow: [240, 48, 42], section: [192, 83, 92], gateleg: [151, 75, 90], washstand: [60, 83, 47], sinkcab: [60, 80, 60],+ office: [64, 105, 64], chaise: [226, 85, 160], corner: [233, 85, 171], cot: [130, 84, 68], bunk: [211, 160, 100], loft: [211, 195, 100], dropleaf: [134, 75, 80], daybed: [207, 83, 91], mixed: [80, 120, 40], sliding: [118, 200, 60], slidecab: [80, 110, 45], bookrow: [160, 202, 28], cabrow: [240, 48, 42], section: [192, 83, 92], gateleg: [151, 75, 90], washstand: [60, 83, 47], sinkcab: [60, 80, 60], appliance: [60, 200, 60],};diff --git a/src/lib/search.ts b/src/lib/search.tsindex 8023c18..93c93f4 100644--- a/src/lib/search.ts+++ b/src/lib/search.ts@@ -20,6 +20,7 @@ const CATEGORY_WORDS: [Kind, string[]][] = [["cabrow", ["tv bench combination", "tv unit combination", "media unit combination", "cabinet combination", "wardrobe combination", "closet combination", "wall cabinet combination"]],["washstand", ["wash stand", "washstand", "vanity", "vanity unit", "bathroom vanity", "basin unit", "basin cabinet", "wash basin cabinet", "washbasin cabinet", "bathroom cabinet", "sink vanity"]],["sinkcab", ["sink cabinet", "sink base", "sink base cabinet", "sink unit", "kitchen sink cabinet", "under sink cabinet", "cabinet for sink", "sink cupboard"]],+ ["appliance", ["appliance cabinet", "oven cabinet", "oven housing", "oven unit", "tall oven unit", "wall oven cabinet", "cabinet for oven", "fridge cabinet", "fridge housing", "refrigerator cabinet", "freezer cabinet", "cabinet for fridge", "microwave cabinet", "hob cabinet", "hob unit", "cooktop cabinet", "hood cabinet", "extractor hood cabinet"]],["shoe", ["shoe", "shoes", "shoe cabinet", "shoe rack"]],["nightstand", ["nightstand", "bedside", "night stand"]],["mixed", ["doors and drawers", "cabinet with drawers", "cupboard with drawers", "wardrobe with drawers", "armoire with drawers"]],@@ -60,7 +61,8 @@ const CATEGORY_WORDS: [Kind, string[]][] = [["bench", ["bench"]],];const KIND_WORDS = new Map(CATEGORY_WORDS);-const LESSER = new Set<Kind>(["bookrow", "cabrow", "section"]);+// rows, sections, and cabinets built around an appliance or a sink, which only come first when asked for+const LESSER = new Set<Kind>(["bookrow", "cabrow", "section", "sinkcab", "appliance"]);export function kindOf(q: string): Kind | null {const f = " " + fold(q) + " ";@@ -158,7 +160,7 @@ export function searchCatalog(q: string, limit = 8): Hit[] {if (!ns && ((first.length >= 3 && r.words.some((w) => w.startsWith(first))) || (firstIsKind && kwHit))) score += 20;for (const t of tokens.slice(1)) if (t.length && r.words.some((w) => w.startsWith(t) || (t.length > 2 && w.includes(t)))) score += 12;if (kw) score += kwHit ? 14 : -30;- // rows of several units and sofa sections come after the whole product, unless the query asks for them+ // rows of several units, sofa sections and appliance cabinets come after the plain product, unless the query asks for themif (e.kind && LESSER.has(e.kind) && kind !== e.kind) score -= 1;if (e.checked) score += 3;if (e.featured) score += 2;