Skip to content

Commit 6ae5c30

Browse files
committed
Use leaflet from package
1 parent 93f1a6d commit 6ae5c30

File tree

4 files changed

+12
-23
lines changed

4 files changed

+12
-23
lines changed

src/components/map.astro

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,27 @@
11
---
2+
import 'leaflet/dist/leaflet.css'
23
export interface Props {
34
loc: [number, number]
45
zoom: number
56
}
67
78
const { loc, zoom } = Astro.props
89
---
9-
<link rel="stylesheet" href="https://unpkg.com/[email protected]/dist/leaflet.css"
10-
integrity="sha512-hoalWLoI8r4UszCkZ5kL8vayOGVae1oxXe/2A4AO6J9+580uKHDO3JdHb7NzwwzK5xr/Fs0W40kiNHxM9vyTtQ=="
11-
crossorigin=""/>
12-
<script
13-
is:inline
14-
src="https://unpkg.com/[email protected]/dist/leaflet.js"
15-
integrity="sha512-BB3hKbKWOc9Ez/TAwyWxNXeoV9c1v6FIeYiBieIWkpLjauysF18NzgR1MBNBXf8/KABdlkX68nAhlwcDFLGPCQ=="
16-
crossorigin=""
17-
></script>
10+
1811
<div id="map" class="mb-3 h-96"></div>
12+
<script is:inline>
13+
var myloc, myzoom
14+
</script>
1915
<script define:vars={{ loc, zoom }}>
20-
var map = L.map('map').setView(loc, zoom)
16+
myloc = loc
17+
myzoom = zoom
18+
</script>
19+
<script>
20+
import L from 'leaflet/dist/leaflet.js'
21+
var map = L.map('map').setView(myloc, myzoom)
2122
L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
2223
maxZoom: 19,
2324
attribution: '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors',
2425
}).addTo(map)
25-
L.marker(loc).addTo(map)
26+
L.marker(myloc).addTo(map)
2627
</script>

src/layouts/base.astro

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -57,16 +57,6 @@ const { frontmatter } = Astro.props
5757
mermaid.initialize({startOnLoad:true});
5858
</script>
5959
}
60-
{frontmatter.extra?.includes('map') &&
61-
<link rel="stylesheet" href="https://unpkg.com/[email protected]/dist/leaflet.css"
62-
integrity="sha512-hoalWLoI8r4UszCkZ5kL8vayOGVae1oxXe/2A4AO6J9+580uKHDO3JdHb7NzwwzK5xr/Fs0W40kiNHxM9vyTtQ=="
63-
crossorigin=""/>
64-
<script
65-
src="https://unpkg.com/[email protected]/dist/leaflet.js"
66-
integrity="sha512-BB3hKbKWOc9Ez/TAwyWxNXeoV9c1v6FIeYiBieIWkpLjauysF18NzgR1MBNBXf8/KABdlkX68nAhlwcDFLGPCQ=="
67-
crossorigin=""
68-
></script>
69-
}
7060
<Header />
7161
<slot />
7262
<Footer />

src/pages/blog/2022-08-23-sample-mdx-post.mdx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ categories:
1111
tags:
1212
- mdx
1313
- sample
14-
extra: ['map']
1514
---
1615
import Map from '../../components/map.astro'
1716

src/pages/contact.astro

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ const frontmatter = {
1212
coverSVG: '../svg/undraw/undraw_contact_us.svg',
1313
socialImage: '../images/undraw/undraw_contact_us.png',
1414
publishDate: SiteMetadata.buildTime,
15-
extra: ['map']
1615
}
1716
---
1817

0 commit comments

Comments
 (0)