Added some cantane data

2025-01-11 20:44:08 +01:00
parent 6ea4bdaef5
commit bb5d995b5d
7 changed files with 65 additions and 8 deletions
--- a/src/components/maps/data/aldys/cantane/markers.json
+++ b/src/components/maps/data/aldys/cantane/markers.json
@@ -0,0 +1,22 @@
+{
+    "data": [
+        {
+            "group": "landmarks",
+            "title": "Pilier d'Ikami",
+            "description": "Abbaye locale dédiée au culte d'Ikami. Une tour de 30m de haut a été érigée à l'arrière de la nef pour servir de clocher.",
+            "markerCoords": {
+                "x": 142.6711747082816,
+                "y": -132.92203370330174
+            }
+        },
+        {
+            "group": "landmarks",
+            "title": "Quartiers du Duc",
+            "description": "Manoir du Duc de Cantane, Geil Brilâme. Beaucoup de grenouilles pataugent dans les douves et les étangs qui entourent la propriété.",
+            "markerCoords": {
+                "x": 171.29758708733308,
+                "y": -83.60967931316306
+            }
+        }
+    ]
+}
--- a/src/components/maps/data/aldys/markers.json
+++ b/src/components/maps/data/aldys/markers.json
@@ -203,12 +203,13 @@
        {
            "group": "cities",
            "title": "Cantane",
-            "description": "",
+            "description": "Petite ville minière excentrée qui accueille les commerçants de gemmes des environs une fois par an.",
            "link": "https://wiki.alexcreates.fr/index.php/Cantane",
            "markerCoords": {
                "x": 197.3492280183025,
                "y": -210.87224307207197
            },
+            "mapId": "/aldys/cantane",
            "cover": "Cantane.jpg",
            "coverAuthor": "Andreas Roller",
            "coverLink": "https://en.wikipedia.org/wiki/Andreas_Roller"
--- a/src/layouts/Layout.astro
+++ b/src/layouts/Layout.astro
@@ -1,9 +1,12 @@
 ---
+import type { Head } from '@/types/Head';
+
 interface Props {
 	title: string;
+    head?: Head
 }

-const { title } = Astro.props;
+const { title, head } = Astro.props;
 ---

 <!doctype html>
@@ -11,7 +14,7 @@ const { title } = Astro.props;
 	<head>
 		<meta charset="UTF-8" />
        <meta name="author" content="Alexis Pelé" />
-		<meta name="description" content="Carte du monde connu de Léim, centrée sur l'Alliance Kaldélienne" />
+		{head?.description && <meta name="description" content={head.description} /> }
 		<meta name="viewport" content="width=device-width; initial-scale=1" />
 		<meta name="generator" content={Astro.generator} />
 		<title>{title} — Leim Wiki</title>
@@ -26,10 +29,13 @@ const { title } = Astro.props;
        <meta name="msapplication-TileColor" content="#00aba9">
        <meta name="theme-color" content="#a9d1eb">

-        <meta property="og:title" content={title}/>
-        <meta property="og:type" content="map" />
+        <meta property="og:title" content={title} />
+        <meta property="og:type" content="website" />
        <meta property="og:url" content={Astro.url} />
-        <meta property="og:image" content="/bailey-zindel-NRQV-hBF10M-unsplash.jpg" />
+        {head?.image && <meta property="og:image" content={head.image} />}
+
+        {head?.description && <meta name="twitter:description" content={head.description} /> }
+        {head?.image && <meta property="twitter:image" content={head.image} />}

        <link rel="stylesheet" href="/leaflet/leaflet.css" rel="preload" />
        <script is:inline src="/leaflet/leaflet.js"></script>
--- a/src/pages/aldys/cantane/index.astro
+++ b/src/pages/aldys/cantane/index.astro
@@ -1,18 +1,26 @@
 ---
+import type { MapMarker, PlayerMarker } from '@/types/Leaflet';
+
 import Layout from '@/layouts/Layout.astro';
 import Map from '@/components/maps/Map.astro'
 import MapOverlay from '@/components/maps/MapOverlay.astro'
+
+import markersData from '@/components/maps/data/aldys/cantane/markers.json'
+
+const markers = markersData.data as MapMarker[]
 ---

 <Layout title="Cantane ~ Cartographie">
    <MapOverlay
        mapKey='aldys-cantane'
+        markers={markers}
    />
    <Map
        mapKey='aldys-cantane'
        zoomifyKey='cantane'
        mapHeight={4124}
        mapWidth={4067}
+        markers={markers}
        rulerDistanceRatio={1.15}
        rulerMainUnit='Mètres'
        rulerHideWalkDistance={true}
--- a/src/pages/index.astro
+++ b/src/pages/index.astro
@@ -12,7 +12,15 @@ const markers = markersData.data as MapMarker[]
 const players = playersData as PlayerMarker
 ---

-<Layout title="Aldys ~ Cartographie">
+<Layout
+    title="Aldys ~ Cartographie"
+    head={
+        {
+            description: "Carte de l'Alliance Kaldélienne sur la planète de Léim.",
+            image: '/images/bailey-zindel-NRQV-hBF10M-unsplash.jpg'
+        }
+    }
+>
    <MapOverlay
        mapKey='aldys'
        markers={markers}
--- a/src/types/Head.ts
+++ b/src/types/Head.ts
@@ -0,0 +1,10 @@
+export interface Head {
+    charset?: string
+    description?: string
+    image?: string
+    twitter?: TwitterHead
+}
+
+interface TwitterHead {
+    card?: string
+}
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,5 +1,7 @@
 {
  "extends": "astro/tsconfigs/strict",
+  "include": [".astro/types.d.ts", "**/*"],
+  "exclude": ["dist"],
  "compilerOptions": {
    "baseUrl": ".",
    "paths": {