Merge pull request #2 from radical-data/working

Improve UI

Author: jokroese

.husky/pre-commit

@@ -1 +1 @@
-pnpm test
+pnpm lint-staged

package.json

@@ -25,16 +25,20 @@
 		"@sveltejs/adapter-netlify": "^5.2.4",
 		"@sveltejs/kit": "^2.20.3",
 		"@sveltejs/vite-plugin-svelte": "^6.2.1",
+		"@tailwindcss/postcss": "^4.1.17",
+		"autoprefixer": "^10.4.22",
 		"eslint": "^9.39.1",
 		"eslint-config-prettier": "^10.1.8",
 		"eslint-plugin-svelte": "^3.13.0",
 		"globals": "^15.14.0",
 		"husky": "^9.1.7",
 		"lint-staged": "^16.2.7",
+		"postcss": "^8.5.6",
 		"prettier": "^3.4.2",
 		"prettier-plugin-svelte": "^3.3.3",
 		"svelte": "^5.43.6",
 		"svelte-check": "^4.2.6",
+		"tailwindcss": "^4.1.17",
 		"tslib": "^2.8.1",
 		"typescript": "^5.7.2",
 		"typescript-eslint": "^8.46.4",

pnpm-lock.yaml

@@ -0,0 +1,6 @@
+export default {
+	plugins: {
+		'@tailwindcss/postcss': {},
+		autoprefixer: {}
+	}
+};

postcss.config.mjs

@@ -66,7 +66,7 @@ describe('reduceFeatureCollection', () => {
 		});
 
 		expect(result.features).toHaveLength(1);
-		expect(result.features[0].properties).toEqual({});
+		expect(result.features[0]).not.toHaveProperty('properties');
 	});
 
 	it('handles empty property set', () => {
@@ -92,7 +92,7 @@ describe('reduceFeatureCollection', () => {
 			propertiesToKeep: new Set()
 		});
 
-		expect(result.features[0].properties).toEqual({});
+		expect(result.features[0]).not.toHaveProperty('properties');
 	});
 
 	it('handles multiple features', () => {

src/lib/reducer.test.ts

@@ -10,9 +10,9 @@ export function reduceFeatureCollection(
 	fc: FeatureCollection,
 	options: ReductionOptions
 ): FeatureCollection {
-	const filtered = filterProperties(fc, options.propertiesToKeep);
 	// eslint-disable-next-line @typescript-eslint/no-explicit-any
-	return truncate(filtered as any, { precision: options.precision });
+	const truncated = truncate(fc as any, { precision: options.precision });
+	return filterProperties(truncated, options.propertiesToKeep);
 }
 
 function filterProperties(fc: FeatureCollection, propertiesToKeep: Set<string>): FeatureCollection {
@@ -26,7 +26,13 @@ function filterProperties(fc: FeatureCollection, propertiesToKeep: Set<string>):
 					filteredProps[key] = props[key];
 				}
 			}
-			return { ...feature, properties: filteredProps };
+			// Exclude properties from the spread, then conditionally add it back
+			// eslint-disable-next-line @typescript-eslint/no-unused-vars
+			const { properties, ...rest } = feature;
+			return {
+				...rest,
+				...(Object.keys(filteredProps).length > 0 ? { properties: filteredProps } : {})
+			} as typeof feature; // Type assertion to preserve intentional omission of properties
 		})
 	};
 }

src/lib/reducer.ts

@@ -2,4 +2,31 @@
 	import '../style.css';
 </script>
 
-<slot />
+<div class="min-h-screen">
+	<div class="mx-auto flex min-h-screen max-w-5xl flex-col gap-6 px-6 py-8">
+		<main class="flex-1">
+			<slot />
+		</main>
+		<footer class="border-t border-slate-200 pt-4 text-xs text-slate-500">
+			Developed by
+			<a
+				href="https://radicaldata.org"
+				target="_blank"
+				rel="noopener"
+				class="font-medium text-sky-700 hover:text-sky-800"
+			>
+				Radical Data
+			</a>
+			for our Comapping project and the rewrite of Queering the Map. For more tools and projects at the
+			intersection of technology, art and activism, visit
+			<a
+				href="https://radicaldata.org"
+				target="_blank"
+				rel="noopener"
+				class="font-medium text-sky-700 hover:text-sky-800"
+			>
+				radicaldata.org
+			</a>.
+		</footer>
+	</div>
+</div>