fix popup name display and move address to var

teambtcmap · Apr 23, 2023 · a0b7505 · a0b7505
1 parent a7a8d7a
commit a0b7505
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/src/lib/map/setup.js b/src/lib/map/setup.js
@@ -563,7 +563,7 @@ export const generateMarker = (
 			element.tags && element.tags.name
 				? `<a href='/merchant/${element.type}:${
 						element.id
-				  }' class='font-bold text-lg text-link hover:text-hover transition-colors leading-snug max-w-[300px]' title='Merchant name'>${
+				  }' class='inline-block font-bold text-lg text-link hover:text-hover transition-colors leading-snug max-w-[300px]' title='Merchant name'>${
 						element.tags.name
 				  }</a> ${description ? `<span id='description' title='Description'></span>` : ''}`
 				: ''

diff --git a/src/routes/merchant/[id]/+page.svelte b/src/routes/merchant/[id]/+page.svelte
@@ -60,6 +60,7 @@
 
 	const name = merchant.osm_json.tags?.name || '';
 	const icon = merchant.tags['icon:android'];
+	const address = merchant.osm_json.tags ? checkAddress(merchant.osm_json.tags) : '';
 	const description = merchant.osm_json.tags?.description || '';
 	const hours = merchant.osm_json.tags?.['opening_hours'] || '';
 	const payment = merchant.tags['payment:uri']
@@ -317,9 +318,11 @@
 						{name ? name : 'BTC Map Merchant'}
 					</h1>
 
-					<h2 class="text-xl text-primary dark:text-white">
-						{merchant.osm_json.tags && checkAddress(merchant.osm_json.tags)}
-					</h2>
+					{#if address}
+						<h2 class="text-xl text-primary dark:text-white">
+							{address}
+						</h2>
+					{/if}
 
 					<a
 						href={`/map?lat=${lat}&long=${long}`}