From 24270bb7bdf004ef255e72a1ee9086df6f01df18 Mon Sep 17 00:00:00 2001 From: Hsieh Chin Fan Date: Mon, 9 Sep 2024 12:21:33 +0800 Subject: refactor: Apply API name for new vesion of mapclay --- src/dumbymap.mjs | 16 +++++++--------- src/editor.mjs | 4 ++-- 2 files changed, 9 insertions(+), 11 deletions(-) (limited to 'src') diff --git a/src/dumbymap.mjs b/src/dumbymap.mjs index 1cc0f07..6fa05b7 100644 --- a/src/dumbymap.mjs +++ b/src/dumbymap.mjs @@ -6,7 +6,7 @@ import MarkdownItFrontMatter from 'markdown-it-front-matter' import MarkdownItTocDoneRight from 'markdown-it-toc-done-right' import LeaderLine from 'leader-line' import PlainDraggable from 'plain-draggable' -import { render, parseConfigsFromText } from 'mapclay' +import { render, parseConfigsFromYaml } from 'mapclay' const observers = new Map() @@ -215,13 +215,11 @@ export const generateMaps = async (container) => { mapIdList.push(mapId) } - const markerOptions = geoLinks.map(link => { - return { - targets: link.targets, - xy: link.xy, - title: link.url.pathname - } - }) + const markerOptions = geoLinks.map(link => ({ + targets: link.targets, + xy: link.xy, + title: link.url.pathname + })) // Render each code block with "language-map" class @@ -234,7 +232,7 @@ export const generateMaps = async (container) => { let configList = [] try { - configList = parseConfigsFromText(configText).map(result => { + configList = parseConfigsFromYaml(configText).map(result => { assignMapId(result) const markersFromLinks = markerOptions.filter(marker => !marker.targets || marker.targets.includes(result.id) diff --git a/src/editor.mjs b/src/editor.mjs index c011c6b..9c0f59b 100644 --- a/src/editor.mjs +++ b/src/editor.mjs @@ -1,6 +1,6 @@ import TinyMDE from 'tiny-markdown-editor' import { markdown2HTML, generateMaps } from './dumbymap' -import { defaultAliasesForRenderer, parseConfigsFromText } from 'mapclay' +import { defaultAliasesForRenderer, parseConfigsFromYaml } from 'mapclay' // Set up Editor {{{ @@ -104,7 +104,7 @@ const defaultApply = '/default.yml' fetch(defaultApply) .then(res => res.text()) .then(rawText => { - const config = parseConfigsFromText(rawText)?.at(0) + const config = parseConfigsFromYaml(rawText)?.at(0) Object.assign(aliasesForMapOptions, config.aliases ?? {}) }) .catch(err => console.warn(`Fail to get aliases from ${defaultApply}`, err)) -- cgit v1.2.3-70-g09d2