diff options
-rw-r--r-- | package.json | 2 | ||||
-rw-r--r-- | src/dumbymap.mjs | 16 | ||||
-rw-r--r-- | src/editor.mjs | 4 |
3 files changed, 10 insertions, 12 deletions
diff --git a/package.json b/package.json index 3e3dd4c..763530e 100644 --- a/package.json +++ b/package.json | |||
@@ -43,7 +43,7 @@ | |||
43 | }, | 43 | }, |
44 | "dependencies": { | 44 | "dependencies": { |
45 | "leader-line": "^1.0.7", | 45 | "leader-line": "^1.0.7", |
46 | "mapclay": "^0.5.4", | 46 | "mapclay": "^0.6.1", |
47 | "markdown-it": "^14.1.0", | 47 | "markdown-it": "^14.1.0", |
48 | "markdown-it-anchor": "^9.1.0", | 48 | "markdown-it-anchor": "^9.1.0", |
49 | "markdown-it-footnote": "^4.0.0", | 49 | "markdown-it-footnote": "^4.0.0", |
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' | |||
6 | import MarkdownItTocDoneRight from 'markdown-it-toc-done-right' | 6 | import MarkdownItTocDoneRight from 'markdown-it-toc-done-right' |
7 | import LeaderLine from 'leader-line' | 7 | import LeaderLine from 'leader-line' |
8 | import PlainDraggable from 'plain-draggable' | 8 | import PlainDraggable from 'plain-draggable' |
9 | import { render, parseConfigsFromText } from 'mapclay' | 9 | import { render, parseConfigsFromYaml } from 'mapclay' |
10 | 10 | ||
11 | const observers = new Map() | 11 | const observers = new Map() |
12 | 12 | ||
@@ -215,13 +215,11 @@ export const generateMaps = async (container) => { | |||
215 | mapIdList.push(mapId) | 215 | mapIdList.push(mapId) |
216 | } | 216 | } |
217 | 217 | ||
218 | const markerOptions = geoLinks.map(link => { | 218 | const markerOptions = geoLinks.map(link => ({ |
219 | return { | 219 | targets: link.targets, |
220 | targets: link.targets, | 220 | xy: link.xy, |
221 | xy: link.xy, | 221 | title: link.url.pathname |
222 | title: link.url.pathname | 222 | })) |
223 | } | ||
224 | }) | ||
225 | 223 | ||
226 | 224 | ||
227 | // Render each code block with "language-map" class | 225 | // Render each code block with "language-map" class |
@@ -234,7 +232,7 @@ export const generateMaps = async (container) => { | |||
234 | 232 | ||
235 | let configList = [] | 233 | let configList = [] |
236 | try { | 234 | try { |
237 | configList = parseConfigsFromText(configText).map(result => { | 235 | configList = parseConfigsFromYaml(configText).map(result => { |
238 | assignMapId(result) | 236 | assignMapId(result) |
239 | const markersFromLinks = markerOptions.filter(marker => | 237 | const markersFromLinks = markerOptions.filter(marker => |
240 | !marker.targets || marker.targets.includes(result.id) | 238 | !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 @@ | |||
1 | import TinyMDE from 'tiny-markdown-editor' | 1 | import TinyMDE from 'tiny-markdown-editor' |
2 | import { markdown2HTML, generateMaps } from './dumbymap' | 2 | import { markdown2HTML, generateMaps } from './dumbymap' |
3 | import { defaultAliasesForRenderer, parseConfigsFromText } from 'mapclay' | 3 | import { defaultAliasesForRenderer, parseConfigsFromYaml } from 'mapclay' |
4 | 4 | ||
5 | // Set up Editor {{{ | 5 | // Set up Editor {{{ |
6 | 6 | ||
@@ -104,7 +104,7 @@ const defaultApply = '/default.yml' | |||
104 | fetch(defaultApply) | 104 | fetch(defaultApply) |
105 | .then(res => res.text()) | 105 | .then(res => res.text()) |
106 | .then(rawText => { | 106 | .then(rawText => { |
107 | const config = parseConfigsFromText(rawText)?.at(0) | 107 | const config = parseConfigsFromYaml(rawText)?.at(0) |
108 | Object.assign(aliasesForMapOptions, config.aliases ?? {}) | 108 | Object.assign(aliasesForMapOptions, config.aliases ?? {}) |
109 | }) | 109 | }) |
110 | .catch(err => console.warn(`Fail to get aliases from ${defaultApply}`, err)) | 110 | .catch(err => console.warn(`Fail to get aliases from ${defaultApply}`, err)) |