feat: Reuse shape

interactivethings · Feb 17, 2023 · 37a7091 · 37a7091
1 parent 30dd70a
commit 37a7091
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 10 deletions.
diff --git a/website/src/pages/api/generate.ts b/website/src/pages/api/generate.ts
@@ -8,6 +8,7 @@ import {
   formatExtensions,
   initMiddleware,
   parseOptions,
+  shapeIndexComparator,
 } from "./_utils";
 
 enableMapSet();
@@ -29,13 +30,12 @@ export default async function handler(
     const options = parseOptions(req, res)!;
 
     const { format, year, shapes } = options;
-    const cwd = process.cwd();
 
     const output = await generate({
       ...options,
       year,
       simplify: query.simplify as string,
-      shapes: [...shapes],
+      shapes: [...shapes].sort(shapeIndexComparator),
       mapshaperCommands: [
         `-o output.${format} format=${format} drop-table id-field=id target=*`,
       ],

diff --git a/website/src/pages/api/v0.ts b/website/src/pages/api/v0.ts
@@ -40,13 +40,6 @@ export default async function handler(
       res.status(500).json({ message: `Unsupported format ${format}` });
     }
 
-    const cwd = process.cwd();
-    const shpFilenames = [...options.shapes]
-      .map((shapeName) => {
-        return path.join(cwd, "public", "swiss-maps", year, `${shapeName}.shp`);
-      })
-      .sort(shapeIndexComparator);
-
     const hasCantons = shapes.has("cantons");
     const hasMunicipalities = shapes.has("municipalities");
     const hasLakes = shapes.has("lakes");
@@ -81,7 +74,7 @@ export default async function handler(
       ...options,
       simplify: query.simplify as string,
       year,
-      shapes: [...shapes],
+      shapes: [...shapes].sort(shapeIndexComparator),
       mapshaperCommands: [
         ...styleCommands,
         `-o output.${format} format=${format} target=*`,