2023-06-16 02:36:11 +02:00
|
|
|
<script lang="ts">
|
2023-10-07 03:07:32 +02:00
|
|
|
|
|
|
|
|
|
|
|
import NextButton from "./Base/NextButton.svelte";
|
|
|
|
import { UIEventSource } from "../Logic/UIEventSource";
|
|
|
|
import ValidatedInput from "./InputElement/ValidatedInput.svelte";
|
|
|
|
import EditLayerState from "./Studio/EditLayerState";
|
|
|
|
import EditLayer from "./Studio/EditLayer.svelte";
|
|
|
|
import Loading from "../assets/svg/Loading.svelte";
|
2023-10-11 04:16:52 +02:00
|
|
|
import Marker from "./Map/Marker.svelte";
|
|
|
|
import { AllSharedLayers } from "../Customizations/AllSharedLayers";
|
|
|
|
import StudioServer from "./Studio/StudioServer";
|
|
|
|
import LoginToggle from "./Base/LoginToggle.svelte";
|
|
|
|
import { OsmConnection } from "../Logic/Osm/OsmConnection";
|
|
|
|
import { QueryParameters } from "../Logic/Web/QueryParameters";
|
2023-10-07 03:07:32 +02:00
|
|
|
|
2023-10-13 18:46:56 +02:00
|
|
|
import layerSchemaRaw from "../../src/assets/schemas/layerconfigmeta.json";
|
2023-10-16 15:06:50 +02:00
|
|
|
import If from "./Base/If.svelte";
|
2023-10-21 09:35:54 +02:00
|
|
|
import BackButton from "./Base/BackButton.svelte";
|
2023-10-07 03:07:32 +02:00
|
|
|
|
2023-10-21 09:35:54 +02:00
|
|
|
export let studioUrl = window.location.hostname === "127.0.0.1" ? "http://127.0.0.1:1235" : "https://studio.mapcomplete.org";
|
2023-10-11 04:16:52 +02:00
|
|
|
const studio = new StudioServer(studioUrl);
|
2023-10-16 15:06:50 +02:00
|
|
|
let layersWithErr = UIEventSource.FromPromiseWithErr(studio.fetchLayerOverview());
|
|
|
|
let layers = layersWithErr.mapD(l => l.success);
|
2023-10-07 03:07:32 +02:00
|
|
|
let state: undefined | "edit_layer" | "new_layer" | "edit_theme" | "new_theme" | "editing_layer" | "loading" = undefined;
|
|
|
|
|
2023-10-11 04:16:52 +02:00
|
|
|
let initialLayerConfig: { id: string };
|
2023-10-07 03:07:32 +02:00
|
|
|
let newLayerId = new UIEventSource<string>("");
|
2023-10-20 19:04:55 +02:00
|
|
|
/**
|
|
|
|
* Also used in the input field as 'feedback', hence not a mappedStore as it must be writable
|
|
|
|
*/
|
2023-10-07 03:07:32 +02:00
|
|
|
let layerIdFeedback = new UIEventSource<string>(undefined);
|
|
|
|
newLayerId.addCallbackD(layerId => {
|
|
|
|
if (layerId === "") {
|
|
|
|
return;
|
|
|
|
}
|
2023-10-12 16:55:26 +02:00
|
|
|
if (layers.data?.has(layerId)) {
|
2023-10-07 03:07:32 +02:00
|
|
|
layerIdFeedback.setData("This id is already used");
|
|
|
|
}
|
|
|
|
}, [layers]);
|
|
|
|
|
|
|
|
|
2023-10-13 18:46:56 +02:00
|
|
|
const layerSchema: ConfigMeta[] = <any>layerSchemaRaw;
|
|
|
|
|
|
|
|
let editLayerState = new EditLayerState(layerSchema, studio);
|
2023-10-21 09:35:54 +02:00
|
|
|
let layerId = editLayerState.configuration.map(layerConfig => layerConfig.id);
|
2023-10-07 03:07:32 +02:00
|
|
|
|
2023-10-11 04:16:52 +02:00
|
|
|
function fetchIconDescription(layerId): any {
|
2023-10-13 18:46:56 +02:00
|
|
|
return AllSharedLayers.getSharedLayersConfigs().get(layerId)?._layerIcon;
|
|
|
|
}
|
|
|
|
|
|
|
|
async function createNewLayer() {
|
2023-10-21 09:35:54 +02:00
|
|
|
if (layerIdFeedback.data !== undefined) {
|
|
|
|
console.warn("There is still some feedback - not starting to create a new layer");
|
|
|
|
return;
|
2023-10-20 19:04:55 +02:00
|
|
|
}
|
2023-10-13 18:46:56 +02:00
|
|
|
state = "loading";
|
|
|
|
const id = newLayerId.data;
|
|
|
|
const createdBy = osmConnection.userDetails.data.name;
|
|
|
|
|
2023-10-20 19:04:55 +02:00
|
|
|
|
2023-10-13 18:46:56 +02:00
|
|
|
try {
|
|
|
|
|
|
|
|
const loaded = await studio.fetchLayer(id);
|
|
|
|
initialLayerConfig = loaded ?? {
|
|
|
|
id, credits: createdBy,
|
2023-10-20 19:04:55 +02:00
|
|
|
minzoom: 15,
|
2023-10-13 18:46:56 +02:00
|
|
|
pointRendering: [
|
|
|
|
{
|
|
|
|
location: ["point", "centroid"],
|
|
|
|
marker: [{
|
|
|
|
icon: "circle",
|
|
|
|
color: "white"
|
|
|
|
}]
|
|
|
|
}
|
|
|
|
],
|
2023-10-16 15:06:50 +02:00
|
|
|
lineRendering: [{
|
|
|
|
width: 1,
|
2023-10-13 18:46:56 +02:00
|
|
|
color: "blue"
|
|
|
|
}]
|
|
|
|
};
|
|
|
|
} catch (e) {
|
|
|
|
initialLayerConfig = { id, credits: createdBy };
|
|
|
|
}
|
|
|
|
state = "editing_layer";
|
2023-10-11 04:16:52 +02:00
|
|
|
}
|
2023-10-13 18:46:56 +02:00
|
|
|
|
|
|
|
let osmConnection = new OsmConnection(new OsmConnection({
|
2023-10-11 04:16:52 +02:00
|
|
|
oauth_token: QueryParameters.GetQueryParameter(
|
|
|
|
"oauth_token",
|
|
|
|
undefined,
|
|
|
|
"Used to complete the login"
|
2023-10-13 18:46:56 +02:00
|
|
|
)
|
|
|
|
}));
|
2023-10-11 04:16:52 +02:00
|
|
|
|
2023-06-16 02:36:11 +02:00
|
|
|
</script>
|
2023-10-11 04:16:52 +02:00
|
|
|
|
2023-10-16 15:06:50 +02:00
|
|
|
<If condition={layersWithErr.map(d => d?.error !== undefined)}>
|
|
|
|
<div>
|
|
|
|
<div class="alert">
|
|
|
|
Something went wrong while contacting the MapComplete Studio Server: {$layersWithErr["error"]}
|
|
|
|
</div>
|
|
|
|
The server might be offline. Please:
|
|
|
|
<ul>
|
|
|
|
|
|
|
|
<li>
|
|
|
|
Try again in a few minutes
|
|
|
|
</li>
|
|
|
|
<li>
|
|
|
|
Contact <a href="https://app.element.io/#/room/#MapComplete:matrix.org">the MapComplete community via the
|
|
|
|
chat.</a> Someone might be able to help you
|
|
|
|
</li>
|
|
|
|
<li>
|
|
|
|
File <a href="https://github.com/pietervdvn/MapComplete/issues">an issue</a>
|
|
|
|
</li>
|
|
|
|
<li>
|
|
|
|
Contact the devs via <a href="mailto:info@posteo.net">email</a>
|
|
|
|
</li>
|
|
|
|
</ul>
|
2023-10-07 03:07:32 +02:00
|
|
|
</div>
|
2023-10-16 15:06:50 +02:00
|
|
|
<LoginToggle ignoreLoading={true} slot="else" state={{osmConnection}}>
|
|
|
|
<div slot="not-logged-in">
|
2023-10-17 17:03:13 +02:00
|
|
|
<NextButton clss="primary" on:click={() => osmConnection.AttemptLogin()}>
|
2023-10-16 15:06:50 +02:00
|
|
|
Please log in to use MapComplete Studio
|
2023-10-13 18:46:56 +02:00
|
|
|
</NextButton>
|
|
|
|
</div>
|
2023-10-16 15:06:50 +02:00
|
|
|
{#if state === undefined}
|
|
|
|
<h1>MapComplete Studio</h1>
|
|
|
|
<div class="w-full flex flex-col">
|
|
|
|
|
|
|
|
<NextButton on:click={() => state = "edit_layer"}>
|
|
|
|
Edit an existing layer
|
|
|
|
</NextButton>
|
|
|
|
<NextButton on:click={() => state = "new_layer"}>
|
|
|
|
Create a new layer
|
|
|
|
</NextButton>
|
|
|
|
<!--
|
|
|
|
<NextButton on:click={() => state = "edit_theme"}>
|
|
|
|
Edit a theme
|
|
|
|
</NextButton>
|
|
|
|
<NextButton on:click={() => state = "new_theme"}>
|
|
|
|
Create a new theme
|
|
|
|
</NextButton>
|
|
|
|
-->
|
|
|
|
</div>
|
|
|
|
{:else if state === "edit_layer"}
|
2023-10-21 09:35:54 +02:00
|
|
|
|
|
|
|
<BackButton clss="small p-1" imageClass="w-8 h-8" on:click={() => {state =undefined}}>MapComplete Studio</BackButton>
|
|
|
|
<h3>Choose a layer to edit</h3>
|
2023-10-16 15:06:50 +02:00
|
|
|
<div class="flex flex-wrap">
|
|
|
|
{#each Array.from($layers) as layerId}
|
|
|
|
<NextButton clss="small" on:click={async () => {
|
2023-10-07 03:07:32 +02:00
|
|
|
state = "loading"
|
2023-10-11 04:16:52 +02:00
|
|
|
initialLayerConfig = await studio.fetchLayer(layerId)
|
2023-10-07 03:07:32 +02:00
|
|
|
state = "editing_layer"
|
|
|
|
}}>
|
2023-10-16 15:06:50 +02:00
|
|
|
<div class="w-4 h-4 mr-1">
|
|
|
|
<Marker icons={fetchIconDescription(layerId)} />
|
|
|
|
</div>
|
|
|
|
{layerId}
|
|
|
|
</NextButton>
|
|
|
|
{/each}
|
2023-10-13 18:46:56 +02:00
|
|
|
</div>
|
2023-10-16 15:06:50 +02:00
|
|
|
{:else if state === "new_layer"}
|
2023-10-21 09:35:54 +02:00
|
|
|
|
2023-10-16 15:06:50 +02:00
|
|
|
<div class="interactive flex m-2 rounded-2xl flex-col p-2">
|
|
|
|
<h3>Enter the ID for the new layer</h3>
|
|
|
|
A good ID is:
|
|
|
|
<ul>
|
|
|
|
<li>a noun</li>
|
|
|
|
<li>singular</li>
|
|
|
|
<li>describes the object</li>
|
|
|
|
<li>in English</li>
|
|
|
|
</ul>
|
|
|
|
<div class="m-2 p-2 w-full">
|
|
|
|
|
|
|
|
<ValidatedInput type="id" value={newLayerId} feedback={layerIdFeedback} on:submit={() => createNewLayer()} />
|
2023-10-11 04:16:52 +02:00
|
|
|
</div>
|
2023-10-16 15:06:50 +02:00
|
|
|
{#if $layerIdFeedback !== undefined}
|
|
|
|
<div class="alert">
|
|
|
|
{$layerIdFeedback}
|
|
|
|
</div>
|
|
|
|
{:else }
|
|
|
|
<NextButton clss="primary" on:click={() => createNewLayer()}>
|
|
|
|
Create layer {$newLayerId}
|
|
|
|
</NextButton>
|
|
|
|
{/if}
|
|
|
|
</div>
|
|
|
|
{:else if state === "loading"}
|
|
|
|
<div class="w-8 h-8">
|
|
|
|
<Loading />
|
|
|
|
</div>
|
|
|
|
{:else if state === "editing_layer"}
|
2023-10-21 09:35:54 +02:00
|
|
|
<EditLayer {initialLayerConfig} state={editLayerState} >
|
|
|
|
<BackButton clss="small p-1" imageClass="w-8 h-8" on:click={() => {state =undefined}}>MapComplete Studio</BackButton>
|
|
|
|
</EditLayer>
|
2023-10-16 15:06:50 +02:00
|
|
|
{/if}
|
|
|
|
</LoginToggle>
|
|
|
|
</If>
|