Compare commits
3 commits
75d3b557fe
...
8e67431622
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8e67431622 | ||
|
|
575534d182 | ||
|
|
68d3142126 |
4 changed files with 161 additions and 77 deletions
|
|
@ -55,6 +55,15 @@ return [
|
|||
// Format markers for response
|
||||
$markers = [];
|
||||
foreach ($markerPages as $marker) {
|
||||
// Get custom icon if available
|
||||
$iconFile = $marker->markerIcon()->toFile();
|
||||
$iconUrl = $iconFile ? $iconFile->url() : null;
|
||||
|
||||
// Get icon size if set
|
||||
$iconSize = $marker->markerIconSize()->isNotEmpty()
|
||||
? (int) $marker->markerIconSize()->value()
|
||||
: 40;
|
||||
|
||||
$markers[] = [
|
||||
'id' => $marker->id(),
|
||||
'slug' => $marker->slug(),
|
||||
|
|
@ -64,7 +73,9 @@ return [
|
|||
'lon' => (float) $marker->longitude()->value()
|
||||
],
|
||||
'num' => $marker->num(),
|
||||
'panelUrl' => (string) $marker->panel()->url()
|
||||
'panelUrl' => (string) $marker->panel()->url(),
|
||||
'iconUrl' => $iconUrl,
|
||||
'iconSize' => $iconSize
|
||||
];
|
||||
}
|
||||
|
||||
|
|
@ -155,15 +166,16 @@ return [
|
|||
->filterBy('intendedTemplate', 'marker');
|
||||
$nextNum = $existingMarkers->count() + 1;
|
||||
|
||||
// Generate unique slug
|
||||
$slug = 'marker-' . time();
|
||||
// Generate title and slug based on title
|
||||
$title = 'Marqueur ' . $nextNum;
|
||||
$slug = Str::slug($title);
|
||||
|
||||
// Create the new marker page
|
||||
$newMarker = $mapPage->createChild([
|
||||
'slug' => $slug,
|
||||
'template' => 'marker',
|
||||
'content' => [
|
||||
'title' => 'Marqueur ' . $nextNum,
|
||||
'title' => $title,
|
||||
'latitude' => $lat,
|
||||
'longitude' => $lon
|
||||
]
|
||||
|
|
@ -172,19 +184,28 @@ return [
|
|||
// Publish the page as listed with the correct num
|
||||
$newMarker->changeStatus('listed', $nextNum);
|
||||
|
||||
// Get custom icon if available (new markers won't have one initially)
|
||||
$iconFile = $newMarker->markerIcon()->toFile();
|
||||
$iconUrl = $iconFile ? $iconFile->url() : null;
|
||||
$iconSize = $newMarker->markerIconSize()->isNotEmpty()
|
||||
? (int) $newMarker->markerIconSize()->value()
|
||||
: 40;
|
||||
|
||||
return [
|
||||
'status' => 'success',
|
||||
'data' => [
|
||||
'marker' => [
|
||||
'id' => $newMarker->id(),
|
||||
'slug' => $newMarker->slug(),
|
||||
'title' => $newMarker->title()->value(),
|
||||
'title' => $title,
|
||||
'position' => [
|
||||
'lat' => $lat,
|
||||
'lon' => $lon
|
||||
],
|
||||
'num' => $newMarker->num(),
|
||||
'panelUrl' => '/panel/pages/' . $newMarker->id()
|
||||
'num' => $nextNum,
|
||||
'panelUrl' => (string) $newMarker->panel()->url(),
|
||||
'iconUrl' => $iconUrl,
|
||||
'iconSize' => $iconSize
|
||||
]
|
||||
]
|
||||
];
|
||||
|
|
@ -267,6 +288,13 @@ return [
|
|||
'longitude' => $lon
|
||||
]);
|
||||
|
||||
// Get custom icon if available
|
||||
$iconFile = $marker->markerIcon()->toFile();
|
||||
$iconUrl = $iconFile ? $iconFile->url() : null;
|
||||
$iconSize = $marker->markerIconSize()->isNotEmpty()
|
||||
? (int) $marker->markerIconSize()->value()
|
||||
: 40;
|
||||
|
||||
return [
|
||||
'status' => 'success',
|
||||
'data' => [
|
||||
|
|
@ -279,7 +307,9 @@ return [
|
|||
'lon' => $lon
|
||||
],
|
||||
'num' => $marker->num(),
|
||||
'panelUrl' => '/panel/pages/' . $marker->id()
|
||||
'panelUrl' => (string) $marker->panel()->url(),
|
||||
'iconUrl' => $iconUrl,
|
||||
'iconSize' => $iconSize
|
||||
]
|
||||
]
|
||||
];
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -36,7 +36,14 @@
|
|||
</template>
|
||||
|
||||
<script>
|
||||
import { ref, computed, watch, onMounted, onBeforeUnmount, nextTick } from 'vue';
|
||||
import {
|
||||
ref,
|
||||
computed,
|
||||
watch,
|
||||
onMounted,
|
||||
onBeforeUnmount,
|
||||
nextTick,
|
||||
} from 'vue';
|
||||
import MapPreview from '../map/MapPreview.vue';
|
||||
import MarkerList from '../map/MarkerList.vue';
|
||||
import { useMarkersApi } from '../../composables/useMarkersApi.js';
|
||||
|
|
@ -120,9 +127,10 @@ export default {
|
|||
});
|
||||
|
||||
// Initialize API composable (only for multi mode)
|
||||
const markersApi = props.mode === 'multi'
|
||||
? useMarkersApi(pageId.value)
|
||||
: { markers: ref([]), loading: ref(false), error: ref(null) };
|
||||
const markersApi =
|
||||
props.mode === 'multi'
|
||||
? useMarkersApi(pageId.value)
|
||||
: { markers: ref([]), loading: ref(false), error: ref(null) };
|
||||
|
||||
const { center, zoom, loadMapData, debouncedSave } = useMapData({
|
||||
defaultCenter: {
|
||||
|
|
@ -141,14 +149,23 @@ export default {
|
|||
const lon = singleLon.value;
|
||||
|
||||
// Only create marker if we have valid coordinates
|
||||
if (!isNaN(lat) && !isNaN(lon) && lat !== null && lon !== null && lat !== 0 && lon !== 0) {
|
||||
return [{
|
||||
id: 'single-marker',
|
||||
position: { lat, lon },
|
||||
title: 'Current position',
|
||||
iconUrl: props.markerIconUrl,
|
||||
iconSize: props.markerIconSize,
|
||||
}];
|
||||
if (
|
||||
!isNaN(lat) &&
|
||||
!isNaN(lon) &&
|
||||
lat !== null &&
|
||||
lon !== null &&
|
||||
lat !== 0 &&
|
||||
lon !== 0
|
||||
) {
|
||||
return [
|
||||
{
|
||||
id: 'single-marker',
|
||||
position: { lat, lon },
|
||||
title: 'Current position',
|
||||
iconUrl: props.markerIconUrl,
|
||||
iconSize: props.markerIconSize,
|
||||
},
|
||||
];
|
||||
}
|
||||
return [];
|
||||
}
|
||||
|
|
@ -175,7 +192,7 @@ export default {
|
|||
|
||||
return {
|
||||
lat: latInput ? parseFloat(latInput.value) : null,
|
||||
lon: lonInput ? parseFloat(lonInput.value) : null
|
||||
lon: lonInput ? parseFloat(lonInput.value) : null,
|
||||
};
|
||||
}
|
||||
|
||||
|
|
@ -194,7 +211,12 @@ export default {
|
|||
singleLat.value = coords.lat;
|
||||
singleLon.value = coords.lon;
|
||||
|
||||
if (!isNaN(coords.lat) && !isNaN(coords.lon) && coords.lat !== 0 && coords.lon !== 0) {
|
||||
if (
|
||||
!isNaN(coords.lat) &&
|
||||
!isNaN(coords.lon) &&
|
||||
coords.lat !== 0 &&
|
||||
coords.lon !== 0
|
||||
) {
|
||||
center.value = { lat: coords.lat, lon: coords.lon };
|
||||
}
|
||||
|
||||
|
|
@ -203,7 +225,11 @@ export default {
|
|||
if (form) {
|
||||
// Listen to input events
|
||||
form.addEventListener('input', (e) => {
|
||||
if (e.target.name && (e.target.name.includes('latitude') || e.target.name.includes('longitude'))) {
|
||||
if (
|
||||
e.target.name &&
|
||||
(e.target.name.includes('latitude') ||
|
||||
e.target.name.includes('longitude'))
|
||||
) {
|
||||
const newCoords = getCoordinatesFromForm();
|
||||
singleLat.value = newCoords.lat;
|
||||
singleLon.value = newCoords.lon;
|
||||
|
|
@ -217,20 +243,32 @@ export default {
|
|||
if (latInput && lonInput) {
|
||||
const observer = new MutationObserver(() => {
|
||||
const newCoords = getCoordinatesFromForm();
|
||||
if (newCoords.lat !== singleLat.value || newCoords.lon !== singleLon.value) {
|
||||
if (
|
||||
newCoords.lat !== singleLat.value ||
|
||||
newCoords.lon !== singleLon.value
|
||||
) {
|
||||
singleLat.value = newCoords.lat;
|
||||
singleLon.value = newCoords.lon;
|
||||
}
|
||||
});
|
||||
|
||||
// Observe attribute changes (value attribute)
|
||||
observer.observe(latInput, { attributes: true, attributeFilter: ['value'] });
|
||||
observer.observe(lonInput, { attributes: true, attributeFilter: ['value'] });
|
||||
observer.observe(latInput, {
|
||||
attributes: true,
|
||||
attributeFilter: ['value'],
|
||||
});
|
||||
observer.observe(lonInput, {
|
||||
attributes: true,
|
||||
attributeFilter: ['value'],
|
||||
});
|
||||
|
||||
// Also poll periodically as a fallback
|
||||
const pollInterval = setInterval(() => {
|
||||
const newCoords = getCoordinatesFromForm();
|
||||
if (newCoords.lat !== singleLat.value || newCoords.lon !== singleLon.value) {
|
||||
if (
|
||||
newCoords.lat !== singleLat.value ||
|
||||
newCoords.lon !== singleLon.value
|
||||
) {
|
||||
singleLat.value = newCoords.lat;
|
||||
singleLon.value = newCoords.lon;
|
||||
}
|
||||
|
|
@ -271,7 +309,14 @@ export default {
|
|||
([lat, lon]) => {
|
||||
if (props.mode === 'single') {
|
||||
// Center map on new position if valid
|
||||
if (!isNaN(lat) && !isNaN(lon) && lat !== null && lon !== null && lat !== 0 && lon !== 0) {
|
||||
if (
|
||||
!isNaN(lat) &&
|
||||
!isNaN(lon) &&
|
||||
lat !== null &&
|
||||
lon !== null &&
|
||||
lat !== 0 &&
|
||||
lon !== 0
|
||||
) {
|
||||
// Force immediate reactivity
|
||||
nextTick(() => {
|
||||
if (mapPreview.value && mapPreview.value.centerOnPosition) {
|
||||
|
|
@ -282,11 +327,14 @@ export default {
|
|||
// Coordinates are invalid/cleared - reset to default center
|
||||
center.value = {
|
||||
lat: props.defaultCenter[0],
|
||||
lon: props.defaultCenter[1]
|
||||
lon: props.defaultCenter[1],
|
||||
};
|
||||
nextTick(() => {
|
||||
if (mapPreview.value && mapPreview.value.centerOnPosition) {
|
||||
mapPreview.value.centerOnPosition(center.value.lat, center.value.lon);
|
||||
mapPreview.value.centerOnPosition(
|
||||
center.value.lat,
|
||||
center.value.lon
|
||||
);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
|
@ -317,7 +365,7 @@ export default {
|
|||
// Normalize position format (ensure lon, not lng)
|
||||
const position = {
|
||||
lat: currentCenter.lat,
|
||||
lon: currentCenter.lon || currentCenter.lng
|
||||
lon: currentCenter.lon || currentCenter.lng,
|
||||
};
|
||||
|
||||
try {
|
||||
|
|
@ -351,7 +399,10 @@ export default {
|
|||
// Center map on marker
|
||||
const marker = markers.value.find((m) => m.id === markerId);
|
||||
if (marker && mapPreview.value && mapPreview.value.centerOnPosition) {
|
||||
mapPreview.value.centerOnPosition(marker.position.lat, marker.position.lon);
|
||||
mapPreview.value.centerOnPosition(
|
||||
marker.position.lat,
|
||||
marker.position.lon
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -398,7 +449,7 @@ export default {
|
|||
function editMarker(markerId) {
|
||||
if (props.mode === 'single') return;
|
||||
|
||||
const marker = markers.value.find(m => m.id === markerId);
|
||||
const marker = markers.value.find((m) => m.id === markerId);
|
||||
if (marker && marker.panelUrl) {
|
||||
window.top.location.href = marker.panelUrl;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
import { ref } from 'vue';
|
||||
import { ref } from "vue";
|
||||
|
||||
/**
|
||||
* Composable for managing markers via Kirby API
|
||||
|
|
@ -29,8 +29,8 @@ export function useMarkersApi(pageId) {
|
|||
return window.csrf;
|
||||
}
|
||||
|
||||
console.warn('CSRF token not found');
|
||||
return '';
|
||||
console.warn("CSRF token not found");
|
||||
return "";
|
||||
};
|
||||
|
||||
/**
|
||||
|
|
@ -42,24 +42,23 @@ export function useMarkersApi(pageId) {
|
|||
|
||||
try {
|
||||
const response = await fetch(`/api/map-editor/pages/${pageId}/markers`, {
|
||||
method: 'GET',
|
||||
method: "GET",
|
||||
headers: {
|
||||
'Content-Type': 'application/json'
|
||||
}
|
||||
"Content-Type": "application/json",
|
||||
},
|
||||
});
|
||||
|
||||
const result = await response.json();
|
||||
|
||||
if (result.status === 'error') {
|
||||
throw new Error(result.message || 'Failed to fetch markers');
|
||||
if (result.status === "error") {
|
||||
throw new Error(result.message || "Failed to fetch markers");
|
||||
}
|
||||
|
||||
markers.value = result.data.markers || [];
|
||||
return markers.value;
|
||||
|
||||
} catch (err) {
|
||||
error.value = err.message;
|
||||
console.error('Error fetching markers:', err);
|
||||
console.error("Error fetching markers:", err);
|
||||
throw err;
|
||||
} finally {
|
||||
loading.value = false;
|
||||
|
|
@ -75,28 +74,28 @@ export function useMarkersApi(pageId) {
|
|||
|
||||
try {
|
||||
const response = await fetch(`/api/map-editor/pages/${pageId}/markers`, {
|
||||
method: 'POST',
|
||||
method: "POST",
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
'X-CSRF': getCsrfToken()
|
||||
"Content-Type": "application/json",
|
||||
"X-CSRF": getCsrfToken(),
|
||||
},
|
||||
body: JSON.stringify({ position })
|
||||
body: JSON.stringify({ position }),
|
||||
});
|
||||
|
||||
const result = await response.json();
|
||||
|
||||
if (result.status === 'error') {
|
||||
throw new Error(result.message || 'Failed to create marker');
|
||||
if (result.status === "error") {
|
||||
throw new Error(result.message || "Failed to create marker");
|
||||
}
|
||||
|
||||
const newMarker = result.data.marker;
|
||||
markers.value.push(newMarker);
|
||||
console.log(newMarker);
|
||||
|
||||
return newMarker;
|
||||
|
||||
} catch (err) {
|
||||
error.value = err.message;
|
||||
console.error('Error creating marker:', err);
|
||||
console.error("Error creating marker:", err);
|
||||
throw err;
|
||||
} finally {
|
||||
loading.value = false;
|
||||
|
|
@ -111,32 +110,34 @@ export function useMarkersApi(pageId) {
|
|||
error.value = null;
|
||||
|
||||
try {
|
||||
const response = await fetch(`/api/map-editor/pages/${pageId}/markers/${markerId}`, {
|
||||
method: 'PATCH',
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
'X-CSRF': getCsrfToken()
|
||||
const response = await fetch(
|
||||
`/api/map-editor/pages/${pageId}/markers/${markerId}`,
|
||||
{
|
||||
method: "PATCH",
|
||||
headers: {
|
||||
"Content-Type": "application/json",
|
||||
"X-CSRF": getCsrfToken(),
|
||||
},
|
||||
body: JSON.stringify({ position }),
|
||||
},
|
||||
body: JSON.stringify({ position })
|
||||
});
|
||||
);
|
||||
|
||||
const result = await response.json();
|
||||
|
||||
if (result.status === 'error') {
|
||||
throw new Error(result.message || 'Failed to update marker position');
|
||||
if (result.status === "error") {
|
||||
throw new Error(result.message || "Failed to update marker position");
|
||||
}
|
||||
|
||||
// Update local marker
|
||||
const index = markers.value.findIndex(m => m.id === markerId);
|
||||
const index = markers.value.findIndex((m) => m.id === markerId);
|
||||
if (index !== -1) {
|
||||
markers.value[index] = result.data.marker;
|
||||
}
|
||||
|
||||
return result.data.marker;
|
||||
|
||||
} catch (err) {
|
||||
error.value = err.message;
|
||||
console.error('Error updating marker position:', err);
|
||||
console.error("Error updating marker position:", err);
|
||||
throw err;
|
||||
} finally {
|
||||
loading.value = false;
|
||||
|
|
@ -151,31 +152,33 @@ export function useMarkersApi(pageId) {
|
|||
error.value = null;
|
||||
|
||||
try {
|
||||
const response = await fetch(`/api/map-editor/pages/${pageId}/markers/${markerId}`, {
|
||||
method: 'DELETE',
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
'X-CSRF': getCsrfToken()
|
||||
}
|
||||
});
|
||||
const response = await fetch(
|
||||
`/api/map-editor/pages/${pageId}/markers/${markerId}`,
|
||||
{
|
||||
method: "DELETE",
|
||||
headers: {
|
||||
"Content-Type": "application/json",
|
||||
"X-CSRF": getCsrfToken(),
|
||||
},
|
||||
},
|
||||
);
|
||||
|
||||
const result = await response.json();
|
||||
|
||||
if (result.status === 'error') {
|
||||
throw new Error(result.message || 'Failed to delete marker');
|
||||
if (result.status === "error") {
|
||||
throw new Error(result.message || "Failed to delete marker");
|
||||
}
|
||||
|
||||
// Remove from local markers array
|
||||
const index = markers.value.findIndex(m => m.id === markerId);
|
||||
const index = markers.value.findIndex((m) => m.id === markerId);
|
||||
if (index !== -1) {
|
||||
markers.value.splice(index, 1);
|
||||
}
|
||||
|
||||
return true;
|
||||
|
||||
} catch (err) {
|
||||
error.value = err.message;
|
||||
console.error('Error deleting marker:', err);
|
||||
console.error("Error deleting marker:", err);
|
||||
throw err;
|
||||
} finally {
|
||||
loading.value = false;
|
||||
|
|
@ -189,6 +192,6 @@ export function useMarkersApi(pageId) {
|
|||
fetchMarkers,
|
||||
createMarker,
|
||||
updateMarkerPosition,
|
||||
deleteMarker
|
||||
deleteMarker,
|
||||
};
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue