新增图源修改功能

meshmap_frontend/src/App.vue

@@ -7,6 +7,7 @@ import AdminDiscardDetails from './components/AdminDiscardDetails.vue'
 import AdminHelpEdit from './components/AdminHelpEdit.vue'
 import AdminLogin from './components/AdminLogin.vue'
 import AdminLoginLogs from './components/AdminLoginLogs.vue'
+import AdminMapSource from './components/AdminMapSource.vue'
 import AdminMqttForward from './components/AdminMqttForward.vue'
 import AdminUsers from './components/AdminUsers.vue'
 import ChatPanel from './components/ChatPanel.vue'
@@ -15,7 +16,8 @@ import HelpPage from './components/HelpPage.vue'
 import MeshMap from './components/MeshMap.vue'
 import NodeDetailedPage from './components/NodeDetailedPage.vue'
 import NodeListPanel from './components/NodeListPanel.vue'
-import type { AdminUser, HealthStatus, MapBoundsChangePayload, MapBoundsQuery, MapRenderable, MapViewportItem, NodeInfo, NodeInfoById, PositionRecord, TextMessage } from './types'
+import { fallbackMapSource, loadDefaultMapSource } from './mapSource'
+import type { AdminUser, HealthStatus, MapBoundsChangePayload, MapBoundsQuery, MapRenderable, MapViewportItem, NodeInfo, NodeInfoById, PositionRecord, PublicMapTileSource, TextMessage } from './types'
 
 const currentPath = window.location.pathname
 const adminPath = currentPath
@@ -50,6 +52,7 @@ const currentMapBounds = ref<MapBoundsQuery | null>(null)
 const currentMapZoom = ref(2)
 const mapReportsLoading = ref(false)
 const mapReportTotal = ref(0)
+const mapSource = ref<PublicMapTileSource>(fallbackMapSource)
 const pendingDeleteAction = ref<PendingDeleteAction | null>(null)
 type DeletableTextMessage = TextMessage & { mergedCount?: number; mergedMessages?: TextMessage[] }
 type NodeActionRequest = { nodeId: string; nodeNum: number | null; message?: DeletableTextMessage }
@@ -292,6 +295,10 @@ async function refresh(showLoading = true) {
   }
 }
 
+async function loadMapSource() {
+  mapSource.value = await loadDefaultMapSource()
+}
+
 async function checkAdminSession() {
   adminChecking.value = true
   try {
@@ -463,6 +470,7 @@ onMounted(() => {
   if (isDetailedPage || isHelpPage) {
     return
   }
+  loadMapSource()
   refresh()
   refreshTimer = window.setInterval(() => refresh(false), 5000)
 })
@@ -493,6 +501,7 @@ onBeforeUnmount(() => {
             <a href="/admin/users" :class="{ active: adminPath === '/admin/users' }">用户管理</a>
             <a href="/admin/blocking_management" :class="{ active: adminPath === '/admin/blocking_management' }">屏蔽管理</a>
             <a href="/admin/mqtt_forward/" :class="{ active: isMqttForwardAdminPage }">MQTT转发</a>
+            <a href="/admin/map_source" :class="{ active: adminPath === '/admin/map_source' }">地图图源</a>
             <a href="/admin/help_edit" :class="{ active: adminPath === '/admin/help_edit' }">帮助编辑</a>
             <a href="/admin/log/login" :class="{ active: adminPath === '/admin/log/login' }">登录日志</a>
             <a href="/admin/discard_details" :class="{ active: adminPath === '/admin/discard_details' }">丢弃数据</a>
@@ -532,6 +541,7 @@ onBeforeUnmount(() => {
         <AdminUsers v-if="adminPath === '/admin/users'" :user="adminUser" />
         <AdminBlockingManagement v-else-if="adminPath === '/admin/blocking_management'" />
         <AdminMqttForward v-else-if="isMqttForwardAdminPage" />
+        <AdminMapSource v-else-if="adminPath === '/admin/map_source'" />
         <AdminHelpEdit v-else-if="adminPath === '/admin/help_edit'" />
         <AdminLoginLogs v-else-if="adminPath === '/admin/log/login'" />
         <AdminDiscardDetails v-else-if="adminPath === '/admin/discard_details'" />
@@ -570,6 +580,7 @@ onBeforeUnmount(() => {
           :is-admin="!!adminUser"
           :auto-fit="false"
           :loading="mapReportsLoading"
+          :map-source="mapSource"
           @bounds-change="handleMapBoundsChange"
           @select-node="selectedNodeId = $event"
           @clear-node="selectedNodeId = null"

meshmap_frontend/src/api.ts

@@ -18,6 +18,9 @@ import type {
   ListResponse,
   MapBoundsQuery,
   MapReport,
+  MapTileSource,
+  MapTileSourcePayload,
+  MapTileSourceResponse,
   MapViewportResponse,
   MQTTForwarder,
   MQTTForwarderPayload,
@@ -29,6 +32,7 @@ import type {
   NodeBlockingRulePayload,
   NodeInfo,
   PositionRecord,
+  PublicMapTileSourceResponse,
   TelemetryRecord,
   TextMessage,
 } from './types'
@@ -125,6 +129,10 @@ export function getMapReportViewport(bounds: MapBoundsQuery, zoom: number, limit
   return getJSON<MapViewportResponse>(`/api/map-reports/viewport?${params.toString()}`)
 }
 
+export function getDefaultMapSource(): Promise<PublicMapTileSourceResponse> {
+  return getJSON<PublicMapTileSourceResponse>('/api/map-source/default')
+}
+
 export function getTextMessages(limit = 100, offset = 0, nodeId = ''): Promise<ListResponse<TextMessage>> {
   return getJSON<ListResponse<TextMessage>>(listPath('/api/text-messages', limit, offset, nodeId))
 }
@@ -201,6 +209,26 @@ export function getAdminLoginLogs(limit = 100, offset = 0): Promise<AdminLoginLo
   return getJSON<AdminLoginLogsResponse>(`/api/admin/log/login?limit=${limit}&offset=${offset}`)
 }
 
+export function getAdminMapSources(limit = 100, offset = 0): Promise<ListResponse<MapTileSource>> {
+  return getJSON<ListResponse<MapTileSource>>(listPath('/api/admin/map-source', limit, offset))
+}
+
+export function createAdminMapSource(payload: MapTileSourcePayload): Promise<MapTileSourceResponse> {
+  return postJSON<MapTileSourceResponse>('/api/admin/map-source', payload)
+}
+
+export function updateAdminMapSource(id: number, payload: MapTileSourcePayload): Promise<MapTileSourceResponse> {
+  return putJSON<MapTileSourceResponse>(`/api/admin/map-source/${id}`, payload)
+}
+
+export function deleteAdminMapSource(id: number): Promise<{ status: string }> {
+  return deleteJSON<{ status: string }>(`/api/admin/map-source/${id}`)
+}
+
+export function setDefaultAdminMapSource(id: number): Promise<MapTileSourceResponse> {
+  return postJSON<MapTileSourceResponse>(`/api/admin/map-source/${id}/default`)
+}
+
 export function getNodeBlockingRules(limit = 100, offset = 0): Promise<ListResponse<NodeBlockingRule>> {
   return getJSON<ListResponse<NodeBlockingRule>>(listPath('/api/admin/blocking/nodes', limit, offset))
 }

meshmap_frontend/src/components/AdminMapSource.vue

@@ -0,0 +1,545 @@
+<script setup lang="ts">
+import { computed, onMounted, ref } from 'vue'
+import { createAdminMapSource, deleteAdminMapSource, getAdminMapSources, setDefaultAdminMapSource, updateAdminMapSource } from '../api'
+import type { MapTileSource, MapTileSourcePayload } from '../types'
+
+const items = ref<MapTileSource[]>([])
+const loading = ref(false)
+const error = ref('')
+const message = ref('')
+const page = ref(1)
+const pageSize = 25
+
+const newSource = ref<MapTileSourcePayload>({
+  name: '',
+  url_template: 'https://tile.openstreetmap.jp/{z}/{x}/{y}.png',
+  attribution: '&copy; OpenStreetMap contributors',
+  max_zoom: 19,
+  enabled: true,
+  is_default: false,
+})
+
+const canPrev = () => page.value > 1
+const canNext = () => items.value.length === pageSize
+const enabledCount = computed(() => items.value.filter((item) => item.enabled).length)
+const defaultSource = computed(() => items.value.find((item) => item.is_default) ?? null)
+
+function editableCopy(item: MapTileSource): MapTileSourcePayload {
+  return {
+    name: item.name,
+    url_template: item.url_template,
+    attribution: item.attribution,
+    max_zoom: item.max_zoom,
+    enabled: item.enabled,
+    is_default: item.is_default,
+  }
+}
+
+const drafts = ref<Record<number, MapTileSourcePayload>>({})
+
+function resetNewSource() {
+  newSource.value = {
+    name: '',
+    url_template: '',
+    attribution: '&copy; OpenStreetMap contributors',
+    max_zoom: 19,
+    enabled: true,
+    is_default: false,
+  }
+}
+
+function validatePayload(payload: MapTileSourcePayload): string {
+  if (!payload.name.trim()) {
+    return '请输入图源名称'
+  }
+  const url = payload.url_template.trim()
+  if (!url) {
+    return '请输入图源 URL 模板'
+  }
+  for (const placeholder of ['{z}', '{x}', '{y}']) {
+    if (!url.includes(placeholder)) {
+      return `URL 模板必须包含 ${placeholder}`
+    }
+  }
+  if (!Number.isInteger(payload.max_zoom) || payload.max_zoom < 1 || payload.max_zoom > 30) {
+    return '最大缩放级别必须是 1 到 30 之间的整数'
+  }
+  if (payload.is_default && !payload.enabled) {
+    return '默认图源必须启用'
+  }
+  return ''
+}
+
+async function refreshItems() {
+  loading.value = true
+  error.value = ''
+  try {
+    const response = await getAdminMapSources(pageSize, (page.value - 1) * pageSize)
+    items.value = response.items
+    drafts.value = Object.fromEntries(response.items.map((item) => [item.id, editableCopy(item)]))
+  } catch (err) {
+    error.value = err instanceof Error ? err.message : String(err)
+  } finally {
+    loading.value = false
+  }
+}
+
+function changePage(nextPage: number) {
+  page.value = Math.max(1, nextPage)
+  refreshItems()
+}
+
+async function createSource() {
+  const validation = validatePayload(newSource.value)
+  if (validation) {
+    error.value = validation
+    return
+  }
+  loading.value = true
+  error.value = ''
+  message.value = ''
+  try {
+    await createAdminMapSource({ ...newSource.value })
+    message.value = '图源已添加'
+    resetNewSource()
+    page.value = 1
+    await refreshItems()
+  } catch (err) {
+    error.value = err instanceof Error ? err.message : String(err)
+  } finally {
+    loading.value = false
+  }
+}
+
+async function saveSource(item: MapTileSource) {
+  const draft = drafts.value[item.id]
+  if (!draft) {
+    return
+  }
+  const validation = validatePayload(draft)
+  if (validation) {
+    error.value = validation
+    return
+  }
+  loading.value = true
+  error.value = ''
+  message.value = ''
+  try {
+    await updateAdminMapSource(item.id, { ...draft })
+    message.value = '图源已保存'
+    await refreshItems()
+  } catch (err) {
+    error.value = err instanceof Error ? err.message : String(err)
+  } finally {
+    loading.value = false
+  }
+}
+
+async function setDefaultSource(item: MapTileSource) {
+  loading.value = true
+  error.value = ''
+  message.value = ''
+  try {
+    await setDefaultAdminMapSource(item.id)
+    message.value = '默认图源已更新'
+    await refreshItems()
+  } catch (err) {
+    error.value = err instanceof Error ? err.message : String(err)
+  } finally {
+    loading.value = false
+  }
+}
+
+async function removeSource(item: MapTileSource) {
+  if (!window.confirm(`确定要删除图源「${item.name}」吗？`)) {
+    return
+  }
+  loading.value = true
+  error.value = ''
+  message.value = ''
+  try {
+    await deleteAdminMapSource(item.id)
+    message.value = '图源已删除'
+    if (items.value.length === 1 && page.value > 1) {
+      page.value -= 1
+    }
+    await refreshItems()
+  } catch (err) {
+    error.value = err instanceof Error ? err.message : String(err)
+  } finally {
+    loading.value = false
+  }
+}
+
+onMounted(refreshItems)
+</script>
+
+<template>
+  <section class="map-source-page">
+    <div class="map-source-hero panel">
+      <div class="hero-copy">
+        <p class="eyebrow">Map source</p>
+        <h2>地图图源</h2>
+        <p class="muted">集中维护 Leaflet 瓦片图源。URL 模板必须包含 <code>{z}</code>、<code>{x}</code>、<code>{y}</code>。</p>
+      </div>
+      <div class="hero-stats">
+        <div>
+          <strong>{{ items.length }}</strong>
+          <span>当前图源</span>
+        </div>
+        <div>
+          <strong>{{ enabledCount }}</strong>
+          <span>已启用</span>
+        </div>
+        <div>
+          <strong>{{ defaultSource?.name || '-' }}</strong>
+          <span>默认图源</span>
+        </div>
+      </div>
+    </div>
+
+    <div class="panel map-source-create-panel">
+      <div class="panel-heading compact">
+        <div>
+          <p class="eyebrow">Create</p>
+          <h2>新增图源</h2>
+        </div>
+        <button class="admin-button ghost" type="button" @click="refreshItems" :disabled="loading">{{ loading ? '刷新中...' : '刷新数据' }}</button>
+      </div>
+
+      <form class="map-source-form" @submit.prevent="createSource">
+        <label class="field">名称<input v-model="newSource.name" placeholder="OpenStreetMap Japan" /></label>
+        <label class="field url-field">URL 模板<input v-model="newSource.url_template" placeholder="https://tile.example.com/{z}/{x}/{y}.png" /></label>
+        <label class="field attribution-field">Attribution<input v-model="newSource.attribution" placeholder="&copy; OpenStreetMap contributors" /></label>
+        <label class="field zoom-field">最大缩放<input v-model.number="newSource.max_zoom" type="number" min="1" max="30" /></label>
+        <label class="switch-card"><input v-model="newSource.enabled" type="checkbox" /> <span>启用</span></label>
+        <label class="switch-card"><input v-model="newSource.is_default" type="checkbox" /> <span>设为默认</span></label>
+        <div class="form-actions">
+          <button class="admin-button" type="submit" :disabled="loading">添加图源</button>
+        </div>
+      </form>
+      <p class="template-tip">示例：<code>https://tile.openstreetmap.jp/{z}/{x}/{y}.png</code></p>
+      <p v-if="error" class="error">{{ error }}</p>
+      <p v-if="message" class="success">{{ message }}</p>
+    </div>
+
+    <div class="panel map-source-list-panel">
+      <div class="panel-heading">
+        <div>
+          <p class="eyebrow">Sources</p>
+          <h2>图源列表</h2>
+        </div>
+        <span class="badge">{{ items.length }} 条</span>
+      </div>
+
+      <div v-if="items.length === 0" class="empty-state">暂无地图图源，先在上方添加一个配置。</div>
+
+      <article v-for="item in items" :key="item.id" class="map-source-card" :class="{ default: item.is_default, disabled: !item.enabled }">
+        <header class="source-card-title">
+          <div>
+            <div class="source-title-row">
+              <h3>{{ item.name }}</h3>
+              <span v-if="item.is_default" class="status-pill ok">默认</span>
+              <span v-else-if="item.enabled" class="status-pill">启用</span>
+              <span v-else class="status-pill disabled">停用</span>
+            </div>
+            <p class="source-url">{{ item.url_template }}</p>
+          </div>
+          <button v-if="!item.is_default" class="admin-button ghost" :disabled="loading || !item.enabled" @click="setDefaultSource(item)">设为默认</button>
+        </header>
+
+        <div v-if="drafts[item.id]" class="source-edit-grid">
+          <label class="field">名称<input v-model="drafts[item.id].name" /></label>
+          <label class="field url-field">URL 模板<input v-model="drafts[item.id].url_template" /></label>
+          <label class="field attribution-field">Attribution<input v-model="drafts[item.id].attribution" /></label>
+          <label class="field zoom-field">最大缩放<input v-model.number="drafts[item.id].max_zoom" type="number" min="1" max="30" /></label>
+          <label class="switch-card"><input v-model="drafts[item.id].enabled" type="checkbox" :disabled="item.is_default" /> <span>启用图源</span></label>
+        </div>
+
+        <div class="source-meta">
+          <div><span>ID</span><strong>{{ item.id }}</strong></div>
+          <div><span>最大缩放</span><strong>{{ item.max_zoom }}</strong></div>
+          <div><span>Attribution</span><strong>{{ item.attribution || '-' }}</strong></div>
+        </div>
+
+        <div class="actions">
+          <button class="admin-button" :disabled="loading" @click="saveSource(item)">保存</button>
+          <button class="admin-button danger" :disabled="loading || item.is_default" @click="removeSource(item)">删除</button>
+        </div>
+      </article>
+
+      <div class="pagination">
+        <button :disabled="loading || !canPrev()" @click="changePage(page - 1)">上一页</button>
+        <span>第 {{ page }} 页</span>
+        <span>每页 {{ pageSize }} 条</span>
+        <button :disabled="loading || !canNext()" @click="changePage(page + 1)">下一页</button>
+      </div>
+    </div>
+  </section>
+</template>
+
+<style scoped>
+.map-source-page {
+  display: grid;
+  gap: 12px;
+}
+
+.map-source-page :deep(input) {
+  width: 100%;
+  box-sizing: border-box;
+  border: 1px solid #cbd5e1;
+  border-radius: 10px;
+  padding: 9px 11px;
+  color: #0f172a;
+  font: inherit;
+  background: #fff;
+  outline: none;
+  transition: border-color 0.15s ease, box-shadow 0.15s ease;
+}
+
+.map-source-page :deep(input:focus) {
+  border-color: #2563eb;
+  box-shadow: 0 0 0 3px rgba(37, 99, 235, 0.14);
+}
+
+.map-source-page :deep(input[type='checkbox']) {
+  width: auto;
+}
+
+.map-source-hero,
+.map-source-create-panel,
+.map-source-list-panel {
+  padding: 18px;
+}
+
+.map-source-hero {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  gap: 1rem;
+  background: linear-gradient(135deg, #ffffff 0%, #eff6ff 100%);
+}
+
+.hero-copy {
+  min-width: 260px;
+}
+
+.hero-stats {
+  display: grid;
+  grid-template-columns: repeat(3, minmax(120px, 1fr));
+  gap: 0.75rem;
+}
+
+.hero-stats div {
+  min-width: 0;
+  border: 1px solid #dbeafe;
+  border-radius: 16px;
+  padding: 12px 16px;
+  text-align: center;
+  background: rgba(255, 255, 255, 0.78);
+}
+
+.hero-stats strong {
+  display: block;
+  overflow: hidden;
+  color: #1d4ed8;
+  font-size: 22px;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.hero-stats span,
+.source-meta span,
+.template-tip,
+.source-url {
+  color: #64748b;
+  font-size: 13px;
+}
+
+.panel-heading,
+.source-card-title,
+.source-title-row,
+.actions {
+  display: flex;
+  gap: 0.75rem;
+  align-items: center;
+  flex-wrap: wrap;
+}
+
+.panel-heading,
+.source-card-title {
+  justify-content: space-between;
+}
+
+.panel-heading.compact {
+  margin-bottom: 1rem;
+}
+
+.map-source-form,
+.source-edit-grid {
+  display: grid;
+  grid-template-columns: minmax(180px, 1fr) minmax(320px, 2fr) minmax(220px, 1.4fr) minmax(100px, 0.5fr) auto auto;
+  gap: 0.75rem;
+  align-items: end;
+}
+
+.field {
+  display: grid;
+  gap: 6px;
+  color: #334155;
+  font-size: 13px;
+  font-weight: 700;
+}
+
+.url-field {
+  min-width: 320px;
+}
+
+.zoom-field {
+  min-width: 96px;
+}
+
+.form-actions {
+  display: flex;
+  justify-content: flex-end;
+}
+
+.switch-card {
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  gap: 8px;
+  min-height: 39px;
+  border: 1px solid #dbe4ef;
+  border-radius: 12px;
+  padding: 9px 11px;
+  color: #334155;
+  font-size: 13px;
+  font-weight: 700;
+  background: #f8fafc;
+}
+
+.template-tip {
+  margin: 12px 0 0;
+}
+
+.map-source-card {
+  border: 1px solid #dbe4ef;
+  border-radius: 16px;
+  padding: 1rem;
+  margin-top: 1rem;
+  background: #fff;
+  box-shadow: inset 4px 0 0 #dbeafe;
+}
+
+.map-source-card.default {
+  box-shadow: inset 4px 0 0 #22c55e;
+}
+
+.map-source-card.disabled {
+  background: #f8fafc;
+  box-shadow: inset 4px 0 0 #cbd5e1;
+}
+
+.source-title-row h3 {
+  margin: 0;
+  color: #0f172a;
+  font-size: 18px;
+}
+
+.source-url {
+  max-width: 860px;
+  margin: 6px 0 0;
+  overflow-wrap: anywhere;
+  font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", monospace;
+}
+
+.status-pill {
+  border-radius: 999px;
+  padding: 7px 12px;
+  color: #1d4ed8;
+  font-size: 13px;
+  font-weight: 800;
+  background: #dbeafe;
+}
+
+.status-pill.ok {
+  color: #166534;
+  background: #dcfce7;
+}
+
+.status-pill.disabled {
+  color: #475569;
+  background: #e2e8f0;
+}
+
+.source-edit-grid {
+  grid-template-columns: minmax(180px, 1fr) minmax(320px, 2fr) minmax(220px, 1.4fr) minmax(100px, 0.5fr) auto;
+  margin-top: 1rem;
+}
+
+.source-meta {
+  display: grid;
+  grid-template-columns: minmax(70px, 0.4fr) minmax(100px, 0.5fr) minmax(220px, 2fr);
+  gap: 0.75rem;
+  margin: 1rem 0;
+}
+
+.source-meta div {
+  min-width: 0;
+  border-radius: 12px;
+  padding: 10px 12px;
+  background: #f8fafc;
+}
+
+.source-meta strong {
+  display: block;
+  margin-top: 3px;
+  overflow-wrap: anywhere;
+  color: #0f172a;
+}
+
+.actions {
+  justify-content: flex-end;
+}
+
+.empty-state {
+  border: 1px dashed #cbd5e1;
+  border-radius: 16px;
+  padding: 24px;
+  color: #64748b;
+  text-align: center;
+  background: #f8fafc;
+}
+
+@media (max-width: 1100px) {
+  .map-source-hero,
+  .panel-heading,
+  .source-card-title {
+    align-items: stretch;
+    flex-direction: column;
+  }
+
+  .hero-stats,
+  .map-source-form,
+  .source-edit-grid,
+  .source-meta {
+    grid-template-columns: 1fr 1fr;
+  }
+
+  .url-field,
+  .attribution-field {
+    grid-column: 1 / -1;
+    min-width: 0;
+  }
+}
+
+@media (max-width: 700px) {
+  .hero-stats,
+  .map-source-form,
+  .source-edit-grid,
+  .source-meta {
+    grid-template-columns: 1fr;
+  }
+}
+</style>

meshmap_frontend/src/components/MeshMap.vue

@@ -2,7 +2,8 @@
 import { nextTick, onBeforeUnmount, onMounted, ref, watch } from 'vue'
 import L from 'leaflet'
 import 'leaflet/dist/leaflet.css'
-import type { MapBoundsChangePayload, MapClusterNode, MapNode, MapRenderable } from '../types'
+import { fallbackMapSource } from '../mapSource'
+import type { MapBoundsChangePayload, MapClusterNode, MapNode, MapRenderable, PublicMapTileSource } from '../types'
 
 const props = withDefaults(defineProps<{
   items: MapRenderable[]
@@ -10,9 +11,11 @@ const props = withDefaults(defineProps<{
   isAdmin: boolean
   autoFit?: boolean
   loading?: boolean
+  mapSource?: PublicMapTileSource
 }>(), {
   autoFit: true,
   loading: false,
+  mapSource: () => fallbackMapSource,
 })
 
 const emit = defineEmits<{
@@ -29,6 +32,7 @@ const menuX = ref(0)
 const menuY = ref(0)
 const lastRaisedNodeId = ref<string | null>(null)
 let map: L.Map | null = null
+let tileLayer: L.TileLayer | null = null
 let markerLayer: L.LayerGroup | null = null
 const markersByKey = new Map<string, L.Marker>()
 let hasFitBounds = false
@@ -55,13 +59,7 @@ onMounted(async () => {
     maxBoundsViscosity: 1.0,
     worldCopyJump: false,
   }).setView(defaultMapCenter, defaultMapZoom)
-  L.tileLayer('https://tile.openstreetmap.jp/{z}/{x}/{y}.png', {
-    minZoom: minMapZoom,
-    maxZoom: 19,
-    noWrap: true,
-    bounds: worldBounds,
-    attribution: '&copy; OpenStreetMap contributors',
-  }).addTo(map)
+  applyTileLayer()
   map.on('click', () => {
     closeNodeMenu()
     emit('clear-node')
@@ -77,6 +75,7 @@ onBeforeUnmount(() => {
   window.removeEventListener('keydown', handleKeydown)
   map?.remove()
   map = null
+  tileLayer = null
   markerLayer = null
   markersByKey.clear()
 })
@@ -87,6 +86,28 @@ watch(
   { deep: true },
 )
 
+watch(
+  () => props.mapSource,
+  () => applyTileLayer(),
+  { deep: true },
+)
+
+function applyTileLayer() {
+  if (!map) {
+    return
+  }
+  if (tileLayer) {
+    tileLayer.remove()
+  }
+  tileLayer = L.tileLayer(props.mapSource.url_template, {
+    minZoom: minMapZoom,
+    maxZoom: props.mapSource.max_zoom || fallbackMapSource.max_zoom,
+    noWrap: true,
+    bounds: worldBounds,
+    attribution: props.mapSource.attribution || fallbackMapSource.attribution,
+  }).addTo(map)
+}
+
 function closeNodeMenu() {
   menuNode.value = null
 }

meshmap_frontend/src/components/NodeDetailedPage.vue

@@ -1,7 +1,8 @@
 <script setup lang="ts">
 import { computed, nextTick, onBeforeUnmount, onMounted, ref } from 'vue'
 import { createNodeBlockingRule, deleteNode, deleteTextMessage, getMapReportById, getNodeInfoById, getPositions, getTelemetry, getTextMessages } from '../api'
-import type { MapReport, NodeInfo, PositionRecord, TelemetryRecord, TextMessage } from '../types'
+import type { MapReport, NodeInfo, PositionRecord, PublicMapTileSource, TelemetryRecord, TextMessage } from '../types'
+import { fallbackMapSource, loadDefaultMapSource } from '../mapSource'
 import ConfirmDeleteModal from './ConfirmDeleteModal.vue'
 import NodeTrajectoryMap from './NodeTrajectoryMap.vue'
 
@@ -15,6 +16,7 @@ const mapReport = ref<MapReport | null>(null)
 const messages = ref<TextMessage[]>([])
 const positions = ref<PositionRecord[]>([])
 const telemetry = ref<TelemetryRecord[]>([])
+const mapSource = ref<PublicMapTileSource>(fallbackMapSource)
 const loading = ref(true)
 const chatLoadingOlder = ref(false)
 const chatHasMore = ref(true)
@@ -367,6 +369,10 @@ function handleChatScroll() {
   loadOlderMessages()
 }
 
+async function loadMapSource() {
+  mapSource.value = await loadDefaultMapSource()
+}
+
 async function loadDetails() {
   loading.value = true
   error.value = ''
@@ -392,6 +398,7 @@ async function loadDetails() {
 onMounted(() => {
   window.addEventListener('click', closeMessageMenu)
   window.addEventListener('keydown', handleKeydown)
+  loadMapSource()
   loadDetails()
 })
 
@@ -492,7 +499,7 @@ onBeforeUnmount(() => {
           </div>
           <span class="badge">{{ positions.length }}</span>
         </div>
-        <NodeTrajectoryMap :positions="positions" />
+        <NodeTrajectoryMap :positions="positions" :map-source="mapSource" />
       </div>
     </div>
 

meshmap_frontend/src/components/NodeTrajectoryMap.vue

@@ -2,16 +2,34 @@
 import { nextTick, onBeforeUnmount, onMounted, ref, watch } from 'vue'
 import L from 'leaflet'
 import 'leaflet/dist/leaflet.css'
-import type { PositionRecord } from '../types'
+import { fallbackMapSource } from '../mapSource'
+import type { PositionRecord, PublicMapTileSource } from '../types'
 
-const props = defineProps<{
+const props = withDefaults(defineProps<{
   positions: PositionRecord[]
-}>()
+  mapSource?: PublicMapTileSource
+}>(), {
+  mapSource: () => fallbackMapSource,
+})
 
 const mapEl = ref<HTMLElement | null>(null)
 let map: L.Map | null = null
+let tileLayer: L.TileLayer | null = null
 let layer: L.LayerGroup | null = null
 
+function applyTileLayer() {
+  if (!map) {
+    return
+  }
+  if (tileLayer) {
+    tileLayer.remove()
+  }
+  tileLayer = L.tileLayer(props.mapSource.url_template, {
+    maxZoom: props.mapSource.max_zoom || fallbackMapSource.max_zoom,
+    attribution: props.mapSource.attribution || fallbackMapSource.attribution,
+  }).addTo(map)
+}
+
 function renderTrajectory() {
   if (!map || !layer) {
     return
@@ -49,10 +67,7 @@ onMounted(async () => {
     maxBoundsViscosity: 1.0,
     worldCopyJump: false,
   }).setView([0, 0], 2)
-  L.tileLayer('https://tile.openstreetmap.jp/{z}/{x}/{y}.png', {
-    maxZoom: 19,
-    attribution: '&copy; OpenStreetMap contributors',
-  }).addTo(map)
+  applyTileLayer()
   layer = L.layerGroup().addTo(map)
   renderTrajectory()
 })
@@ -60,6 +75,7 @@ onMounted(async () => {
 onBeforeUnmount(() => {
   map?.remove()
   map = null
+  tileLayer = null
   layer = null
 })
 
@@ -68,6 +84,12 @@ watch(
   () => renderTrajectory(),
   { deep: true },
 )
+
+watch(
+  () => props.mapSource,
+  () => applyTileLayer(),
+  { deep: true },
+)
 </script>
 
 <template>

meshmap_frontend/src/mapSource.ts

@@ -0,0 +1,19 @@
+import { getDefaultMapSource } from './api'
+import type { PublicMapTileSource } from './types'
+
+export const fallbackMapSource: PublicMapTileSource = {
+  id: 0,
+  name: 'OpenStreetMap Japan',
+  url_template: 'https://tile.openstreetmap.jp/{z}/{x}/{y}.png',
+  attribution: '© OpenStreetMap contributors',
+  max_zoom: 19,
+}
+
+export async function loadDefaultMapSource(): Promise<PublicMapTileSource> {
+  try {
+    const response = await getDefaultMapSource()
+    return response.item
+  } catch {
+    return fallbackMapSource
+  }
+}

meshmap_frontend/src/types.ts

@@ -76,6 +76,38 @@ export interface MapBoundsChangePayload {
   zoom: number
 }
 
+export interface PublicMapTileSource {
+  id: number
+  name: string
+  url_template: string
+  attribution: string
+  max_zoom: number
+}
+
+export interface MapTileSource extends PublicMapTileSource {
+  enabled: boolean
+  is_default: boolean
+  created_at: string
+  updated_at: string
+}
+
+export interface MapTileSourcePayload {
+  name: string
+  url_template: string
+  attribution: string
+  max_zoom: number
+  enabled: boolean
+  is_default: boolean
+}
+
+export interface MapTileSourceResponse {
+  item: MapTileSource
+}
+
+export interface PublicMapTileSourceResponse {
+  item: PublicMapTileSource
+}
+
 export interface MapViewportPoint extends MapReport {
   type: 'point'
 }