feat: added command to update default marker color, marker size and c…

…ustom marker URL

refs: #22

CHANGELOG.md

@@ -9,7 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
-- [🚀] Added command support for default map style and API token update
+- [🚀] Added command support for default map style, marker color, custom marker URL and API token update
 
 ## [Next] - 2024-10-23
 

src/commands/custom-marker.command.ts

@@ -0,0 +1,28 @@
+import { Notice } from 'obsidian';
+import MapboxPlugin from '../main';
+import { CustomMarkerUrlModal } from '../modals/custom-marker.modal';
+
+/**
+ * Creates a modal based on the marker URL modal and opens it.
+ * Callback function will receive the new set marker URL of the user and saves it to the settings.
+ * @param plugin instance of the MapboxPlugin (required for getting settings and app instance)
+ */
+const showModalForCustomMarkerUrl = async (plugin: MapboxPlugin) => {
+	new CustomMarkerUrlModal(plugin, async (result) => {
+		plugin.settings.markerUrl = result;
+		plugin.saveData(plugin.settings);
+		new Notice('Default marker URL updated. Reload your view.');
+	}).open();
+};
+
+/**
+ * Used to register a new marker URL command.
+ * @param plugin instance of the MapboxPlugin
+ */
+export const changeDefaultMarkerUrlCommand = async (plugin: MapboxPlugin) => {
+	plugin.addCommand({
+		id: 'change-default-marker-url',
+		name: 'Change default marker URL',
+		callback: () => showModalForCustomMarkerUrl(plugin),
+	});
+};

src/commands/map-zoom.command.ts

@@ -0,0 +1,28 @@
+import { Notice } from 'obsidian';
+import MapboxPlugin from '../main';
+import { MapZoomModal } from '../modals/map-zoom.modal';
+
+/**
+ * Creates a modal based on the map zoom and opens it.
+ * Callback function will receive the new set default map zoom of the user and saves it to the settings.
+ * @param plugin instance of the MapboxPlugin (required for getting settings and app instance)
+ */
+const showModalForDefaultMapZoom = async (plugin: MapboxPlugin) => {
+	new MapZoomModal(plugin, async (result) => {
+		plugin.settings.mapZoom = result;
+		plugin.saveData(plugin.settings);
+		new Notice('Default map zoom level updated. Reload your view.');
+	}).open();
+};
+
+/**
+ * Used to register a new map zoom command.
+ * @param plugin instance of the MapboxPlugin
+ */
+export const changeDefaultMapZoomLevelCommand = async (plugin: MapboxPlugin) => {
+	plugin.addCommand({
+		id: 'change-default-map-zoom-level',
+		name: 'Change default map zoom level',
+		callback: () => showModalForDefaultMapZoom(plugin),
+	});
+};

src/commands/marker-color.command.ts

@@ -0,0 +1,28 @@
+import { Notice } from 'obsidian';
+import MapboxPlugin from '../main';
+import { MarkerColorModal } from '../modals/marker-color.modal';
+
+/**
+ * Creates a modal based on the marker color modal and opens it.
+ * Callback function will receive the new set marker color of the user and saves it to the settings.
+ * @param plugin instance of the MapboxPlugin (required for getting settings and app instance)
+ */
+const showModalForDefaultMarkerColor = async (plugin: MapboxPlugin) => {
+	new MarkerColorModal(plugin, async (result) => {
+		plugin.settings.markerColor = result.replace('#', '');
+		plugin.saveData(plugin.settings);
+		new Notice('Default marker color updated. Reload your view.');
+	}).open();
+};
+
+/**
+ * Used to register a new marker color command.
+ * @param plugin instance of the MapboxPlugin
+ */
+export const changeDefaultMarkerColorCommand = async (plugin: MapboxPlugin) => {
+	plugin.addCommand({
+		id: 'change-default-marker-color',
+		name: 'Change default marker color',
+		callback: () => showModalForDefaultMarkerColor(plugin),
+	});
+};

src/commands/marker-size.command.ts

@@ -22,7 +22,7 @@ const showModalForMarkerSize = async (plugin: MapboxPlugin) => {
 export const changeMarkerSizeCommand = async (plugin: MapboxPlugin) => {
 	plugin.addCommand({
 		id: 'change-marker-size',
-		name: 'Change marker size',
+		name: 'Change default marker size',
 		callback: () => showModalForMarkerSize(plugin),
 	});
 };

src/main.ts

@@ -1,6 +1,9 @@
 import { Plugin } from 'obsidian';
 import { changeApiTokenCommand } from './commands/api-token.command';
+import { changeDefaultMarkerUrlCommand } from './commands/custom-marker.command';
 import { changeMapStyleCommand } from './commands/map-style.command';
+import { changeDefaultMapZoomLevelCommand } from './commands/map-zoom.command';
+import { changeDefaultMarkerColorCommand } from './commands/marker-color.command';
 import { changeMarkerSizeCommand } from './commands/marker-size.command';
 import { addNewLocationFromClipboard } from './commands/new-from-clipboard.command';
 import { toggleReverseCoordinates } from './commands/toggle-reverse.command';
@@ -23,6 +26,9 @@ export default class MapboxPlugin extends Plugin {
 		changeMarkerSizeCommand(this);
 		changeApiTokenCommand(this);
 		changeMapStyleCommand(this);
+		changeDefaultMapZoomLevelCommand(this);
+		changeDefaultMarkerColorCommand(this);
+		changeDefaultMarkerUrlCommand(this);
 		toggleReverseCoordinates(this);
 
 		// Register the processors for the given code blocks.

src/modals/custom-marker.modal.ts

@@ -0,0 +1,23 @@
+import { Modal, Setting } from 'obsidian';
+import MapboxPlugin from '../main';
+import { markerUrlSetting } from '../settings/plugin-settings.control';
+
+export class CustomMarkerUrlModal extends Modal {
+	constructor(plugin: MapboxPlugin, onSubmit: (result: string) => void) {
+		super(plugin.app);
+		this.titleEl.setText('Set default custom marker URL');
+
+		let markerUrl = plugin.settings.markerUrl;
+		markerUrlSetting(this.contentEl, plugin, (value: string) => (markerUrl = value));
+
+		new Setting(this.contentEl).addButton((btn) =>
+			btn
+				.setButtonText('Submit')
+				.setCta()
+				.onClick(() => {
+					this.close();
+					onSubmit(markerUrl);
+				}),
+		);
+	}
+}

src/modals/map-zoom.modal.ts

@@ -0,0 +1,23 @@
+import { Modal, Setting } from 'obsidian';
+import MapboxPlugin from '../main';
+import { mapZoomSetting } from '../settings/plugin-settings.control';
+
+export class MapZoomModal extends Modal {
+	constructor(plugin: MapboxPlugin, onSubmit: (result: string) => void) {
+		super(plugin.app);
+		this.titleEl.setText('Update default map zoom level');
+
+		let zoomLevel = plugin.settings.mapZoom;
+		mapZoomSetting(this.contentEl, plugin, (value: string) => (zoomLevel = value));
+
+		new Setting(this.contentEl).addButton((btn) =>
+			btn
+				.setButtonText('Submit')
+				.setCta()
+				.onClick(() => {
+					this.close();
+					onSubmit(zoomLevel);
+				}),
+		);
+	}
+}

src/modals/marker-color.modal.ts

@@ -0,0 +1,23 @@
+import { Modal, Setting } from 'obsidian';
+import MapboxPlugin from '../main';
+import { markerColorSetting } from '../settings/plugin-settings.control';
+
+export class MarkerColorModal extends Modal {
+	constructor(plugin: MapboxPlugin, onSubmit: (result: string) => void) {
+		super(plugin.app);
+		this.titleEl.setText('Update default marker color');
+
+		let color = plugin.settings.markerColor;
+		markerColorSetting(this.contentEl, plugin, (value: string) => (color = value));
+
+		new Setting(this.contentEl).addButton((btn) =>
+			btn
+				.setButtonText('Submit')
+				.setCta()
+				.onClick(() => {
+					this.close();
+					onSubmit(color);
+				}),
+		);
+	}
+}

src/modals/marker-size.modal.ts

@@ -5,7 +5,7 @@ import { markerSizeSetting } from '../settings/plugin-settings.control';
 export class MarkerSizeModal extends Modal {
 	constructor(plugin: MapboxPlugin, onSubmit: (result: string) => void) {
 		super(plugin.app);
-		this.titleEl.setText('Change marker size');
+		this.titleEl.setText('Change default marker size');
 
 		let size: 's' | 'm' | 'l' = plugin.settings.markerSize;
 		markerSizeSetting(