Fix map preview not loading

andrew-bierman · Aug 25, 2024 · 325e30d · 325e30d
1 parent 8686361
commit 325e30d
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 11 deletions.
diff --git a/packages/app/components/card/LargeCard.tsx b/packages/app/components/card/LargeCard.tsx
@@ -126,13 +126,10 @@ const loadStyles = (theme: any) => {
       flexDirection: 'column',
       alignItems: 'center',
       textAlign: 'center',
-      padding:
-        Platform.OS === 'web'
-          ? currentTheme.size.cardPadding
-          : currentTheme.size.mobilePadding,
+      padding: Platform.OS === 'web' ? '5%' : currentTheme.size.mobilePadding,
       paddingHorizontal: currentTheme.padding.paddingInside,
       marginBottom: 20,
-      height: Platform.OS === 'web' ? 650 : '23%',
+      height: Platform.OS === 'web' ? 'calc(min( 80vh, 80vw))' : '23%',
       minHeight: 350,
       overflow: 'hidden',
     },

diff --git a/packages/map/src/Map.native.tsx b/packages/map/src/Map.native.tsx
@@ -32,7 +32,7 @@ import {
 import MapButtonsOverlay from './MapButtonsOverlay';
 
 import { gpx as toGeoJSON } from '@tmcw/togeojson';
-import { useNativeMap } from 'app/hooks/map/useNativeMap';
+import { useNativeMap } from './hooks/useNativeMap';
 import * as DocumentPicker from 'expo-document-picker';
 import * as FileSystem from 'expo-file-system';
 import { DOMParser } from 'xmldom';

diff --git a/packages/map/src/Map.tsx b/packages/map/src/Map.tsx
@@ -32,7 +32,7 @@ const WebMap: FC<MapProps> = ({ shape: shapeProp }) => {
   const handleGpxUpload = useGpxUpload(setShape);
 
   const element = (
-    <View style={[styles.container, { height: showModal ? '100%' : 400 }]}>
+    <View style={[styles.container, { height: '100%' }]}>
       {showModal || isPolygonOrMultiPolygon(shape) ? (
         <View
           key="map"

diff --git a/packages/map/src/index.tsx b/packages/map/src/index.tsx
@@ -20,6 +20,7 @@ export const Map: React.FC<MapProps> = ({
     <View
       style={{
         width: '100%',
+        flex: 1,
         paddingHorizontal: 5,
         marginBottom: 20,
       }}

diff --git a/server/src/controllers/mapPreview/index.ts b/server/src/controllers/mapPreview/index.ts
@@ -28,15 +28,13 @@ const getMapPreview = async (ctx: Context) => {
     }
 
     const newResponse = new Response(response.body, {
+      status: 200,
       headers: {
         'Content-Type': 'image/png',
       },
     });
 
-    console.log('newResponse', newResponse);
-
-    // return newResponse;
-    return ctx.json(newResponse, 200);
+    return newResponse;
   } catch (error) {
     console.log(error);
     return ctx.json({ error: error.message }, 400);