Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor frontmatter location parsing to util function #461

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Refactor frontmatter location parsing to util function #461

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 8 additions & 42 deletions src/renderer/renderer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ import t from "../l10n/locale";
import { LeafletMapView } from "src/map/view";
import { Marker, Overlay } from "src/layer";
import { promisify } from "util";
import {parseFrontmatterLocation} from "../utils/frontmatter";

declare module "leaflet" {
interface Map {
Expand Down Expand Up @@ -1105,40 +1106,12 @@ export class LeafletRenderer extends MarkdownRenderChild {

const id = getId();

if (frontmatter.location) {
let locations = frontmatter.location;
if (
locations.length &&
!(locations[0] instanceof Array)
) {
locations = [locations];
}
for (const location of locations) {
let err = false,
[lat, long] = location;

try {
lat =
typeof lat === "number"
? lat
: Number(lat?.split("%").shift());
long =
typeof long === "number"
? long
: Number(long?.split("%").shift());
} catch (e) {
err = true;
}
let parsedLocations = frontmatter.location ? parseFrontmatterLocation(frontmatter.location, file.basename) : null;

if (err || isNaN(lat) || isNaN(long)) {
new Notice(
t(
"Could not parse location in %1",
file.basename
)
);
continue;
}
if (parsedLocations != null) {
let locations = parsedLocations;
for (const location of locations) {
let [lat, long] = location;

let min, max;
if (frontmatter.mapzoom) {
Expand Down Expand Up @@ -1267,17 +1240,10 @@ export class LeafletRenderer extends MarkdownRenderChild {
continue;
}

let location = frontmatter.location;
if (!location) continue;
if (
location instanceof Array &&
!(location[0] instanceof Array)
) {
location = [location];
}
if (!parsedLocations) continue;
overlaysToReturn.push([
overlayColor,
location[0],
parsedLocations[0],
frontmatter[overlayTag],
`${file.basename}: ${overlayTag}`,
id
Expand Down
43 changes: 43 additions & 0 deletions src/utils/frontmatter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
import {Notice} from "obsidian";
import t from "../l10n/locale";

export function parseFrontmatterLocation(frontmatterLocationField: unknown, fileBasename: string): Array<[number, number]> {
if (typeof frontmatterLocationField === "string") {
// Try parsing as a number pair
const parseResult = /(?:\[|^)([+-]?\d+(?:\.\d+)?)%?\s*,\s*([+-]?\d+(?:\.\d+)?)%?(?:]|$)/.exec(frontmatterLocationField);
if (parseResult != null) {
const lat = Number(parseResult[1]), long = Number(parseResult[2]);
if (!isNaN(lat) && !isNaN(long)) {
return [[lat, long]];
}
}
}
if (typeof frontmatterLocationField === "object" && Array.isArray(frontmatterLocationField)) {
let twoDLocationsArray: Array<Array<unknown>>;
if (!Array.isArray(frontmatterLocationField[0])) {
twoDLocationsArray = [frontmatterLocationField];
} else {
twoDLocationsArray = frontmatterLocationField;
}
const outputArray: Array<[number, number]> = [];
for (const location of twoDLocationsArray) {
let [lat, long] = location.map((value) => {
if (typeof value === "number") return value;
if (typeof value === "string") return Number(value.split("%").shift());
return Number.NaN;
});
if (isNaN(lat) || isNaN(long)) {
new Notice(
t(
"Could not parse location in %1",
fileBasename
)
);
} else {
outputArray.push([lat, long]);
}
}
return outputArray;
}
return [];
}
40 changes: 7 additions & 33 deletions src/utils/watcher.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import { LeafletSymbol } from "src/utils/leaflet-import";
import { LeafletRenderer } from "src/renderer/renderer";
import t from "src/l10n/locale";
import { Marker, Overlay } from "src/layer";
import {parseFrontmatterLocation} from "./frontmatter";
const L = window[LeafletSymbol];

export class Watcher extends Component {
Expand Down Expand Up @@ -65,23 +66,10 @@ export class Watcher extends Component {
this.type = this.parseMarkerType(this.frontmatter);

if ("location" in this.frontmatter) {
let locations = this.frontmatter.location;
if (
locations instanceof Array &&
!(locations[0] instanceof Array)
) {
locations = [locations];
}
let locations = parseFrontmatterLocation(this.frontmatter.location, this.file.basename);
this.ids.set("location", getId());
for (let index in locations) {
const location = locations[index];
if (
!(
location.length == 2 &&
location.every((v: any) => typeof v == "number")
)
)
continue;
this.markers.push(
new Marker(this.renderer.map, {
id: this.ids.get("location"),
Expand Down Expand Up @@ -231,21 +219,14 @@ export default class OldWatcher extends Events {
let overlays = [];
const markers = this.map.getMarkersById(this.fileIds.get("marker"));

const parsedLocations = this.frontmatter.location ? parseFrontmatterLocation(this.frontmatter.location, this.file.basename) : null;

if (
markers &&
this.frontmatter.location &&
this.frontmatter.location instanceof Array
parsedLocations != null
) {
try {
let locations = this.frontmatter.location;
if (
locations &&
locations instanceof Array &&
!(locations[0] instanceof Array)
) {
locations = [locations];
}

let locations = parsedLocations;
for (let index in locations) {
const location = locations[index];
const marker = markers[index];
Expand Down Expand Up @@ -370,14 +351,7 @@ export default class OldWatcher extends Events {
return id != this.fileIds.get("overlayTag");
}
);
let locations = this.frontmatter.location ?? [0, 0];
if (
locations &&
locations instanceof Array &&
!(locations[0] instanceof Array)
) {
locations = [locations];
}
let locations = parsedLocations;
overlays.push([
this.map.options.overlayColor ?? "blue",
locations[0],
Expand Down