Multi Geocode (#109)

* multi-geocode for new map

* backward compatibility w/ city polygon

api/README.md

@@ -19,7 +19,7 @@ bun install
 
 ### Run locally
 ```sh
-bun server.ts
+bun dev
 ```
 
 ## Deployment

api/package.json

@@ -4,6 +4,7 @@
   "main": "server.ts",
   "type": "module",
   "scripts": {
+    "dev": "NODE_ENV=development bun server.ts",
     "start": "bun server.ts"
   },
   "dependencies": {

api/server.ts

@@ -34,11 +34,12 @@ const start = async () => {
     });
   });
 
-  // Coors Light Config
+  // Coors Banquet Config
   await server.register(cors, {
     origin: (origin, cb) => {
       const allowedOrigins = [
-        'http://localhost:5173', // vite dev server
+        'http://localhost:5173', // DeFlock Legacy
+        'http://localhost:3000', // FlockHopper
         'https://deflock.org',
         'https://www.deflock.org'
       ];
@@ -80,11 +81,35 @@ const start = async () => {
     },
   }, async (request, reply) => {
     const { query } = request.query as { query: string };
-    reply.header('Cache-Control', 'public, max-age=300, s-maxage=86400');
+    reply.header('Cache-Control', 'public, max-age=86400, s-maxage=86400');
     const result = await nominatim.geocodeSingleResult(query);
     return result;
   });
 
+  server.get('/geocode/multi', {
+    schema: {
+      querystring: {
+        type: 'object',
+        properties: {
+          query: { type: 'string' },
+        },
+        required: ['query'],
+      },
+      response: {
+        200: {
+          type: 'array',
+          items: NominatimResultSchema,
+        },
+        500: { type: 'object', properties: { error: { type: 'string' } } },
+      },
+    },
+  }, async (request, reply) => {
+    const { query } = request.query as { query: string };
+    reply.header('Cache-Control', 'public, max-age=86400, s-maxage=86400');
+    const result = await nominatim.geocodePhrase(query);
+    return result;
+  });
+
   server.get('/sponsors/github', {
     schema: {
       querystring: {
@@ -110,8 +135,10 @@ const start = async () => {
   });
 
   try {
-    await server.listen({ host: '0.0.0.0', port: 3000 });
-    console.log('Server listening on port 3000');
+    const defaultPort = process.env.NODE_ENV === 'development' ? 3420 : 3000;
+    const port = process.env.PORT ? parseInt(process.env.PORT, 10) : defaultPort;
+    await server.listen({ host: '0.0.0.0', port });
+    console.log(`Server listening on port ${port}`);
   } catch (err) {
     console.error('Failed to start server:', err);
     server.log.error(err);

api/services/NominatimClient.ts

@@ -8,10 +8,10 @@ export const NominatimResultSchema = Type.Object({
   boundingbox: Type.Tuple([Type.String(), Type.String(), Type.String(), Type.String()]),
   class: Type.String(),
   display_name: Type.String(),
-  geojson: Type.Object({
+  geojson: Type.Optional(Type.Object({
     coordinates: Type.Any(),
     type: Type.String(),
-  }),
+  })),
   importance: Type.Number(),
   lat: Type.String(),
   licence: Type.String(),
@@ -39,16 +39,17 @@ const cache: Cache = createCache({
 export class NominatimClient {
   baseUrl = 'https://nominatim.openstreetmap.org/search';
 
-  async geocodePhrase(query: string): Promise<NominatimResult[]> {
+  async geocodePhrase(query: string, includeGeoJson: boolean = false): Promise<NominatimResult[]> {
     const cacheKey = `geocode:${query}`;
     const cached = await cache.get(cacheKey);
     if (cached) {
       return cached as NominatimResult[];
     }
-    const url = `${this.baseUrl}?q=${encodeURIComponent(query)}&polygon_geojson=1&format=json`;
+    const geojsonParam = includeGeoJson ? '&polygon_geojson=1' : '';
+    const url = `${this.baseUrl}?q=${encodeURIComponent(query)}&format=json&addressdetails=1&limit=8&countrycodes=us&dedupe=1${geojsonParam}`;
     const response = await fetch(url, {
       headers: {
-        'User-Agent': 'DeFlock/1.1',
+        'User-Agent': 'DeFlock/1.2',
       },
     });
     if (!response.ok) {
@@ -60,7 +61,7 @@ export class NominatimClient {
   }
 
   async geocodeSingleResult(query: string): Promise<NominatimResult | null> {
-    const results = await this.geocodePhrase(query);
+    const results = await this.geocodePhrase(query, true);
     
     if (!results.length) return null;