forked from MapComplete/MapComplete
Studio: fix presets
This commit is contained in:
parent
223acee29c
commit
4c59f4482d
17 changed files with 244 additions and 62 deletions
|
@ -215,14 +215,14 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"tags": {
|
"tags": {
|
||||||
"description": "The tags to add. It determines the icon too.\nUse <code>key=value</code>\n\nquestion: What tag should be added to the new object?\ntype: simpletag",
|
"description": "A single tag (encoded as <code>key=value</code>) out of all the tags to add onto the newly created point.\nNote that the icon in the UI will be chosen automatically based on the tags provided here.\n\nquestion: What tag should be added to the new object?\ntype: simple_tag",
|
||||||
"type": "array",
|
"type": "array",
|
||||||
"items": {
|
"items": {
|
||||||
"type": "string"
|
"type": "string"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"description": {
|
"description": {
|
||||||
"description": "The _first sentence_ of the description is shown on the button of the `add` menu.\nThe full description is shown in the confirmation dialog.\n\n(The first sentence is until the first '.'-character in the description)",
|
"description": "An extra explanation of what the feature is, if it is not immediately clear from the title alone.\n\nThe _first sentence_ of the description is shown on the button of the `add` menu.\nThe full description is shown in the confirmation dialog.\n\n(The first sentence is until the first '.'-character in the description)\n\nquestion: How would you describe this feature?",
|
||||||
"anyOf": [
|
"anyOf": [
|
||||||
{
|
{
|
||||||
"$ref": "#/definitions/Record<string,string>"
|
"$ref": "#/definitions/Record<string,string>"
|
||||||
|
@ -233,7 +233,7 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"exampleImages": {
|
"exampleImages": {
|
||||||
"description": "Example images, which show real-life pictures of what such a feature might look like\n\nType: image",
|
"description": "The URL of an example image which shows a real-life example of what such a feature might look like.\n\nType: image\nquestion: What is the URL of an image showing such a feature?",
|
||||||
"type": "array",
|
"type": "array",
|
||||||
"items": {
|
"items": {
|
||||||
"type": "string"
|
"type": "string"
|
||||||
|
|
|
@ -215,14 +215,14 @@ export default {
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"tags": {
|
"tags": {
|
||||||
"description": "The tags to add. It determines the icon too.\nUse <code>key=value</code>\n\nquestion: What tag should be added to the new object?\ntype: simpletag",
|
"description": "A single tag (encoded as <code>key=value</code>) out of all the tags to add onto the newly created point.\nNote that the icon in the UI will be chosen automatically based on the tags provided here.\n\nquestion: What tag should be added to the new object?\ntype: simple_tag",
|
||||||
"type": "array",
|
"type": "array",
|
||||||
"items": {
|
"items": {
|
||||||
"type": "string"
|
"type": "string"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"description": {
|
"description": {
|
||||||
"description": "The _first sentence_ of the description is shown on the button of the `add` menu.\nThe full description is shown in the confirmation dialog.\n\n(The first sentence is until the first '.'-character in the description)",
|
"description": "An extra explanation of what the feature is, if it is not immediately clear from the title alone.\n\nThe _first sentence_ of the description is shown on the button of the `add` menu.\nThe full description is shown in the confirmation dialog.\n\n(The first sentence is until the first '.'-character in the description)\n\nquestion: How would you describe this feature?",
|
||||||
"anyOf": [
|
"anyOf": [
|
||||||
{
|
{
|
||||||
"$ref": "#/definitions/Record<string,string>"
|
"$ref": "#/definitions/Record<string,string>"
|
||||||
|
@ -233,7 +233,7 @@ export default {
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"exampleImages": {
|
"exampleImages": {
|
||||||
"description": "Example images, which show real-life pictures of what such a feature might look like\n\nType: image",
|
"description": "The URL of an example image which shows a real-life example of what such a feature might look like.\n\nType: image\nquestion: What is the URL of an image showing such a feature?",
|
||||||
"type": "array",
|
"type": "array",
|
||||||
"items": {
|
"items": {
|
||||||
"type": "string"
|
"type": "string"
|
||||||
|
|
|
@ -1926,14 +1926,14 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"tags": {
|
"tags": {
|
||||||
"description": "The tags to add. It determines the icon too.\nUse <code>key=value</code>\n\nquestion: What tag should be added to the new object?\ntype: simpletag",
|
"description": "A single tag (encoded as <code>key=value</code>) out of all the tags to add onto the newly created point.\nNote that the icon in the UI will be chosen automatically based on the tags provided here.\n\nquestion: What tag should be added to the new object?\ntype: simple_tag",
|
||||||
"type": "array",
|
"type": "array",
|
||||||
"items": {
|
"items": {
|
||||||
"type": "string"
|
"type": "string"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"description": {
|
"description": {
|
||||||
"description": "The _first sentence_ of the description is shown on the button of the `add` menu.\nThe full description is shown in the confirmation dialog.\n\n(The first sentence is until the first '.'-character in the description)",
|
"description": "An extra explanation of what the feature is, if it is not immediately clear from the title alone.\n\nThe _first sentence_ of the description is shown on the button of the `add` menu.\nThe full description is shown in the confirmation dialog.\n\n(The first sentence is until the first '.'-character in the description)\n\nquestion: How would you describe this feature?",
|
||||||
"anyOf": [
|
"anyOf": [
|
||||||
{
|
{
|
||||||
"$ref": "#/definitions/Record<string,string>"
|
"$ref": "#/definitions/Record<string,string>"
|
||||||
|
@ -1944,7 +1944,7 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"exampleImages": {
|
"exampleImages": {
|
||||||
"description": "Example images, which show real-life pictures of what such a feature might look like\n\nType: image",
|
"description": "The URL of an example image which shows a real-life example of what such a feature might look like.\n\nType: image\nquestion: What is the URL of an image showing such a feature?",
|
||||||
"type": "array",
|
"type": "array",
|
||||||
"items": {
|
"items": {
|
||||||
"type": "string"
|
"type": "string"
|
||||||
|
@ -2372,14 +2372,14 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"tags": {
|
"tags": {
|
||||||
"description": "The tags to add. It determines the icon too.\nUse <code>key=value</code>\n\nquestion: What tag should be added to the new object?\ntype: simpletag",
|
"description": "A single tag (encoded as <code>key=value</code>) out of all the tags to add onto the newly created point.\nNote that the icon in the UI will be chosen automatically based on the tags provided here.\n\nquestion: What tag should be added to the new object?\ntype: simple_tag",
|
||||||
"type": "array",
|
"type": "array",
|
||||||
"items": {
|
"items": {
|
||||||
"type": "string"
|
"type": "string"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"description": {
|
"description": {
|
||||||
"description": "The _first sentence_ of the description is shown on the button of the `add` menu.\nThe full description is shown in the confirmation dialog.\n\n(The first sentence is until the first '.'-character in the description)",
|
"description": "An extra explanation of what the feature is, if it is not immediately clear from the title alone.\n\nThe _first sentence_ of the description is shown on the button of the `add` menu.\nThe full description is shown in the confirmation dialog.\n\n(The first sentence is until the first '.'-character in the description)\n\nquestion: How would you describe this feature?",
|
||||||
"anyOf": [
|
"anyOf": [
|
||||||
{
|
{
|
||||||
"$ref": "#/definitions/Record<string,string>"
|
"$ref": "#/definitions/Record<string,string>"
|
||||||
|
@ -2390,7 +2390,7 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"exampleImages": {
|
"exampleImages": {
|
||||||
"description": "Example images, which show real-life pictures of what such a feature might look like\n\nType: image",
|
"description": "The URL of an example image which shows a real-life example of what such a feature might look like.\n\nType: image\nquestion: What is the URL of an image showing such a feature?",
|
||||||
"type": "array",
|
"type": "array",
|
||||||
"items": {
|
"items": {
|
||||||
"type": "string"
|
"type": "string"
|
||||||
|
|
|
@ -1905,14 +1905,14 @@ export default {
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"tags": {
|
"tags": {
|
||||||
"description": "The tags to add. It determines the icon too.\nUse <code>key=value</code>\n\nquestion: What tag should be added to the new object?\ntype: simpletag",
|
"description": "A single tag (encoded as <code>key=value</code>) out of all the tags to add onto the newly created point.\nNote that the icon in the UI will be chosen automatically based on the tags provided here.\n\nquestion: What tag should be added to the new object?\ntype: simple_tag",
|
||||||
"type": "array",
|
"type": "array",
|
||||||
"items": {
|
"items": {
|
||||||
"type": "string"
|
"type": "string"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"description": {
|
"description": {
|
||||||
"description": "The _first sentence_ of the description is shown on the button of the `add` menu.\nThe full description is shown in the confirmation dialog.\n\n(The first sentence is until the first '.'-character in the description)",
|
"description": "An extra explanation of what the feature is, if it is not immediately clear from the title alone.\n\nThe _first sentence_ of the description is shown on the button of the `add` menu.\nThe full description is shown in the confirmation dialog.\n\n(The first sentence is until the first '.'-character in the description)\n\nquestion: How would you describe this feature?",
|
||||||
"anyOf": [
|
"anyOf": [
|
||||||
{
|
{
|
||||||
"$ref": "#/definitions/Record<string,string>"
|
"$ref": "#/definitions/Record<string,string>"
|
||||||
|
@ -1923,7 +1923,7 @@ export default {
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"exampleImages": {
|
"exampleImages": {
|
||||||
"description": "Example images, which show real-life pictures of what such a feature might look like\n\nType: image",
|
"description": "The URL of an example image which shows a real-life example of what such a feature might look like.\n\nType: image\nquestion: What is the URL of an image showing such a feature?",
|
||||||
"type": "array",
|
"type": "array",
|
||||||
"items": {
|
"items": {
|
||||||
"type": "string"
|
"type": "string"
|
||||||
|
@ -2350,14 +2350,14 @@ export default {
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"tags": {
|
"tags": {
|
||||||
"description": "The tags to add. It determines the icon too.\nUse <code>key=value</code>\n\nquestion: What tag should be added to the new object?\ntype: simpletag",
|
"description": "A single tag (encoded as <code>key=value</code>) out of all the tags to add onto the newly created point.\nNote that the icon in the UI will be chosen automatically based on the tags provided here.\n\nquestion: What tag should be added to the new object?\ntype: simple_tag",
|
||||||
"type": "array",
|
"type": "array",
|
||||||
"items": {
|
"items": {
|
||||||
"type": "string"
|
"type": "string"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"description": {
|
"description": {
|
||||||
"description": "The _first sentence_ of the description is shown on the button of the `add` menu.\nThe full description is shown in the confirmation dialog.\n\n(The first sentence is until the first '.'-character in the description)",
|
"description": "An extra explanation of what the feature is, if it is not immediately clear from the title alone.\n\nThe _first sentence_ of the description is shown on the button of the `add` menu.\nThe full description is shown in the confirmation dialog.\n\n(The first sentence is until the first '.'-character in the description)\n\nquestion: How would you describe this feature?",
|
||||||
"anyOf": [
|
"anyOf": [
|
||||||
{
|
{
|
||||||
"$ref": "#/definitions/Record<string,string>"
|
"$ref": "#/definitions/Record<string,string>"
|
||||||
|
@ -2368,7 +2368,7 @@ export default {
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"exampleImages": {
|
"exampleImages": {
|
||||||
"description": "Example images, which show real-life pictures of what such a feature might look like\n\nType: image",
|
"description": "The URL of an example image which shows a real-life example of what such a feature might look like.\n\nType: image\nquestion: What is the URL of an image showing such a feature?",
|
||||||
"type": "array",
|
"type": "array",
|
||||||
"items": {
|
"items": {
|
||||||
"type": "string"
|
"type": "string"
|
||||||
|
|
|
@ -254,25 +254,30 @@ export interface LayerConfigJson {
|
||||||
*/
|
*/
|
||||||
title: string | Record<string, string>
|
title: string | Record<string, string>
|
||||||
/**
|
/**
|
||||||
* The tags to add. It determines the icon too.
|
* A single tag (encoded as <code>key=value</code>) out of all the tags to add onto the newly created point.
|
||||||
* Use <code>key=value</code>
|
* Note that the icon in the UI will be chosen automatically based on the tags provided here.
|
||||||
*
|
*
|
||||||
* question: What tag should be added to the new object?
|
* question: What tag should be added to the new object?
|
||||||
* type: simpletag
|
* type: simple_tag
|
||||||
*/
|
*/
|
||||||
tags: string[]
|
tags: string[]
|
||||||
/**
|
/**
|
||||||
|
* An extra explanation of what the feature is, if it is not immediately clear from the title alone.
|
||||||
|
*
|
||||||
* The _first sentence_ of the description is shown on the button of the `add` menu.
|
* The _first sentence_ of the description is shown on the button of the `add` menu.
|
||||||
* The full description is shown in the confirmation dialog.
|
* The full description is shown in the confirmation dialog.
|
||||||
*
|
*
|
||||||
* (The first sentence is until the first '.'-character in the description)
|
* (The first sentence is until the first '.'-character in the description)
|
||||||
|
*
|
||||||
|
* question: How would you describe this feature?
|
||||||
*/
|
*/
|
||||||
description?: string | Record<string, string>
|
description?: string | Record<string, string>
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Example images, which show real-life pictures of what such a feature might look like
|
* The URL of an example image which shows a real-life example of what such a feature might look like.
|
||||||
*
|
*
|
||||||
* Type: image
|
* Type: image
|
||||||
|
* question: What is the URL of an image showing such a feature?
|
||||||
*/
|
*/
|
||||||
exampleImages?: string[]
|
exampleImages?: string[]
|
||||||
|
|
||||||
|
|
|
@ -8,6 +8,7 @@
|
||||||
import {Validator} from "./Validator"
|
import {Validator} from "./Validator"
|
||||||
import {Unit} from "../../Models/Unit"
|
import {Unit} from "../../Models/Unit"
|
||||||
import UnitInput from "../Popup/UnitInput.svelte"
|
import UnitInput from "../Popup/UnitInput.svelte"
|
||||||
|
import {Utils} from "../../Utils";
|
||||||
|
|
||||||
export let type: ValidatorType
|
export let type: ValidatorType
|
||||||
export let feedback: UIEventSource<Translation> | undefined = undefined
|
export let feedback: UIEventSource<Translation> | undefined = undefined
|
||||||
|
@ -25,6 +26,9 @@
|
||||||
let _value = new UIEventSource(value.data ?? "")
|
let _value = new UIEventSource(value.data ?? "")
|
||||||
|
|
||||||
let validator: Validator = Validators.get(type ?? "string")
|
let validator: Validator = Validators.get(type ?? "string")
|
||||||
|
if(validator === undefined){
|
||||||
|
console.warn("Didn't find a validator for type", type)
|
||||||
|
}
|
||||||
let selectedUnit: UIEventSource<string> = new UIEventSource<string>(undefined)
|
let selectedUnit: UIEventSource<string> = new UIEventSource<string>(undefined)
|
||||||
let _placeholder = placeholder ?? validator?.getPlaceholder() ?? type
|
let _placeholder = placeholder ?? validator?.getPlaceholder() ?? type
|
||||||
|
|
||||||
|
@ -47,6 +51,7 @@
|
||||||
$: {
|
$: {
|
||||||
// The type changed -> reset some values
|
// The type changed -> reset some values
|
||||||
validator = Validators.get(type ?? "string")
|
validator = Validators.get(type ?? "string")
|
||||||
|
|
||||||
_placeholder = placeholder ?? validator?.getPlaceholder() ?? type
|
_placeholder = placeholder ?? validator?.getPlaceholder() ?? type
|
||||||
feedback = feedback?.setData(validator?.getFeedback(_value.data, getCountry))
|
feedback = feedback?.setData(validator?.getFeedback(_value.data, getCountry))
|
||||||
|
|
||||||
|
@ -56,9 +61,9 @@
|
||||||
function setValues() {
|
function setValues() {
|
||||||
// Update the value stores
|
// Update the value stores
|
||||||
const v = _value.data
|
const v = _value.data
|
||||||
if (!validator.isValid(v, getCountry) || v === "") {
|
if (!validator?.isValid(v, getCountry) || v === "") {
|
||||||
value.setData(undefined)
|
value.setData(undefined)
|
||||||
feedback?.setData(validator.getFeedback(v, getCountry))
|
feedback?.setData(validator?.getFeedback(v, getCountry))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -74,10 +79,10 @@
|
||||||
onDestroy(_value.addCallbackAndRun((_) => setValues()))
|
onDestroy(_value.addCallbackAndRun((_) => setValues()))
|
||||||
onDestroy(selectedUnit.addCallback((_) => setValues()))
|
onDestroy(selectedUnit.addCallback((_) => setValues()))
|
||||||
if (validator === undefined) {
|
if (validator === undefined) {
|
||||||
throw "Not a valid type for a validator:" + type
|
throw "Not a valid type (no validator found) for type '" + type+"'; did you perhaps mean one of: "+Utils.sortedByLevenshteinDistance(type, Validators.AllValidators.map(v => v.name), v => v).slice(0, 5).join(", ")
|
||||||
}
|
}
|
||||||
|
|
||||||
const isValid = _value.map((v) => validator.isValid(v, getCountry))
|
const isValid = _value.map((v) => validator?.isValid(v, getCountry) ?? true)
|
||||||
|
|
||||||
let htmlElem: HTMLInputElement
|
let htmlElem: HTMLInputElement
|
||||||
|
|
||||||
|
@ -89,13 +94,13 @@
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
{#if validator.textArea}
|
{#if validator?.textArea}
|
||||||
<form on:submit|preventDefault={() => dispatch("submit")}>
|
<form on:submit|preventDefault={() => dispatch("submit")}>
|
||||||
|
|
||||||
<textarea
|
<textarea
|
||||||
class="w-full"
|
class="w-full"
|
||||||
bind:value={$_value}
|
bind:value={$_value}
|
||||||
inputmode={validator.inputmode ?? "text"}
|
inputmode={validator?.inputmode ?? "text"}
|
||||||
placeholder={_placeholder}></textarea>
|
placeholder={_placeholder}></textarea>
|
||||||
</form>
|
</form>
|
||||||
{:else}
|
{:else}
|
||||||
|
@ -104,7 +109,7 @@
|
||||||
bind:this={htmlElem}
|
bind:this={htmlElem}
|
||||||
bind:value={$_value}
|
bind:value={$_value}
|
||||||
class="w-full"
|
class="w-full"
|
||||||
inputmode={validator.inputmode ?? "text"}
|
inputmode={validator?.inputmode ?? "text"}
|
||||||
placeholder={_placeholder}
|
placeholder={_placeholder}
|
||||||
/>
|
/>
|
||||||
{#if !$isValid}
|
{#if !$isValid}
|
||||||
|
|
|
@ -61,7 +61,7 @@ export abstract class Validator {
|
||||||
return Translations.t.validation[this.name].description
|
return Translations.t.validation[this.name].description
|
||||||
}
|
}
|
||||||
|
|
||||||
public isValid(_: string, __?: () => string): boolean {
|
public isValid(key: string, getCountry?: () => string): boolean {
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -18,6 +18,8 @@ import ColorValidator from "./Validators/ColorValidator"
|
||||||
import BaseUIElement from "../BaseUIElement"
|
import BaseUIElement from "../BaseUIElement"
|
||||||
import Combine from "../Base/Combine"
|
import Combine from "../Base/Combine"
|
||||||
import Title from "../Base/Title"
|
import Title from "../Base/Title"
|
||||||
|
import SimpleTagValidator from "./Validators/SimpleTagValidator"
|
||||||
|
import ImageUrlValidator from "./Validators/ImageUrlValidator"
|
||||||
|
|
||||||
export type ValidatorType = (typeof Validators.availableTypes)[number]
|
export type ValidatorType = (typeof Validators.availableTypes)[number]
|
||||||
|
|
||||||
|
@ -58,6 +60,8 @@ export default class Validators {
|
||||||
new PhoneValidator(),
|
new PhoneValidator(),
|
||||||
new OpeningHoursValidator(),
|
new OpeningHoursValidator(),
|
||||||
new ColorValidator(),
|
new ColorValidator(),
|
||||||
|
new SimpleTagValidator(),
|
||||||
|
new ImageUrlValidator(),
|
||||||
]
|
]
|
||||||
|
|
||||||
private static _byType = Validators._byTypeConstructor()
|
private static _byType = Validators._byTypeConstructor()
|
||||||
|
|
39
UI/InputElement/Validators/ImageUrlValidator.ts
Normal file
39
UI/InputElement/Validators/ImageUrlValidator.ts
Normal file
|
@ -0,0 +1,39 @@
|
||||||
|
import UrlValidator from "./UrlValidator"
|
||||||
|
import { Translation } from "../../i18n/Translation"
|
||||||
|
|
||||||
|
export default class ImageUrlValidator extends UrlValidator {
|
||||||
|
private static readonly allowedExtensions = ["jpg", "jpeg", "svg", "png"]
|
||||||
|
|
||||||
|
constructor() {
|
||||||
|
super(
|
||||||
|
"image",
|
||||||
|
"Same as the URL-parameter, except that it checks that the URL ends with `.jpg`, `.png` or some other typical image format"
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
private static hasValidExternsion(str: string): boolean {
|
||||||
|
str = str.toLowerCase()
|
||||||
|
return ImageUrlValidator.allowedExtensions.some((ext) => str.endsWith(ext))
|
||||||
|
}
|
||||||
|
|
||||||
|
getFeedback(s: string, _?: () => string): Translation | undefined {
|
||||||
|
const superF = super.getFeedback(s, _)
|
||||||
|
if (superF) {
|
||||||
|
return superF
|
||||||
|
}
|
||||||
|
if (!ImageUrlValidator.hasValidExternsion(s)) {
|
||||||
|
return new Translation(
|
||||||
|
"This URL does not end with one of the allowed extensions. These are: " +
|
||||||
|
ImageUrlValidator.allowedExtensions.join(", ")
|
||||||
|
)
|
||||||
|
}
|
||||||
|
return undefined
|
||||||
|
}
|
||||||
|
|
||||||
|
isValid(str: string): boolean {
|
||||||
|
if (!super.isValid(str)) {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
return ImageUrlValidator.hasValidExternsion(str)
|
||||||
|
}
|
||||||
|
}
|
57
UI/InputElement/Validators/SimpleTagValidator.ts
Normal file
57
UI/InputElement/Validators/SimpleTagValidator.ts
Normal file
|
@ -0,0 +1,57 @@
|
||||||
|
import { Validator } from "../Validator"
|
||||||
|
import { Translation } from "../../i18n/Translation"
|
||||||
|
import Translations from "../../i18n/Translations"
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Checks that the input conforms `key=value`, where `key` and `value` don't have too much weird characters
|
||||||
|
*/
|
||||||
|
export default class SimpleTagValidator extends Validator {
|
||||||
|
constructor() {
|
||||||
|
super(
|
||||||
|
"simple_tag",
|
||||||
|
"A simple tag of the format `key=value` where `key` conforms to a normal key `"
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
getFeedback(tag: string): Translation | undefined {
|
||||||
|
const parts = tag.split("=")
|
||||||
|
if (parts.length < 2) {
|
||||||
|
return Translations.T("A tag should contain a = to separate the 'key' and 'value'")
|
||||||
|
}
|
||||||
|
if (parts.length > 2) {
|
||||||
|
return Translations.T(
|
||||||
|
"A tag should contain precisely one `=` to separate the 'key' and 'value', but " +
|
||||||
|
(parts.length - 1) +
|
||||||
|
" equal signs were found"
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
const [key, value] = parts
|
||||||
|
if (key.length > 255) {
|
||||||
|
return Translations.T("A `key` should be at most 255 characters")
|
||||||
|
}
|
||||||
|
if (value.length > 255) {
|
||||||
|
return Translations.T("A `value should be at most 255 characters")
|
||||||
|
}
|
||||||
|
|
||||||
|
if (key.length == 0) {
|
||||||
|
return Translations.T("A `key` should not be empty")
|
||||||
|
}
|
||||||
|
if (value.length == 0) {
|
||||||
|
return Translations.T("A `value should not be empty")
|
||||||
|
}
|
||||||
|
|
||||||
|
const keyRegex = /[a-zA-Z0-9:_]+/
|
||||||
|
if (!key.match(keyRegex)) {
|
||||||
|
return Translations.T(
|
||||||
|
"A `key` should only have the characters `a-zA-Z0-9`, `:` or `_`"
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
return undefined
|
||||||
|
}
|
||||||
|
|
||||||
|
isValid(tag: string): boolean {
|
||||||
|
return this.getFeedback(tag) === undefined
|
||||||
|
}
|
||||||
|
}
|
|
@ -1,10 +1,10 @@
|
||||||
import { Validator } from "../Validator"
|
import { Validator } from "../Validator"
|
||||||
|
|
||||||
export default class UrlValidator extends Validator {
|
export default class UrlValidator extends Validator {
|
||||||
constructor() {
|
constructor(name?: string, explanation?: string) {
|
||||||
super(
|
super(
|
||||||
"url",
|
name ??"url",
|
||||||
"The validatedTextField will format URLs to always be valid and have a https://-header (even though the 'https'-part will be hidden from the user. Furthermore, some tracking parameters will be removed",
|
explanation?? "The validatedTextField will format URLs to always be valid and have a https://-header (even though the 'https'-part will be hidden from the user. Furthermore, some tracking parameters will be removed",
|
||||||
"url"
|
"url"
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,13 +1,44 @@
|
||||||
import { OsmConnection } from "../../Logic/Osm/OsmConnection"
|
import { OsmConnection } from "../../Logic/Osm/OsmConnection"
|
||||||
import { ConfigMeta } from "./configMeta"
|
import { ConfigMeta } from "./configMeta"
|
||||||
|
import { Store, UIEventSource } from "../../Logic/UIEventSource"
|
||||||
|
import { LayerConfigJson } from "../../Models/ThemeConfig/Json/LayerConfigJson"
|
||||||
|
|
||||||
export default class EditLayerState {
|
export default class EditLayerState {
|
||||||
public readonly osmConnection: OsmConnection
|
public readonly osmConnection: OsmConnection
|
||||||
public readonly schema: ConfigMeta[]
|
public readonly schema: ConfigMeta[]
|
||||||
|
|
||||||
|
public readonly featureSwitches: { featureSwitchIsDebugging: UIEventSource<boolean> }
|
||||||
|
|
||||||
|
public readonly configuration: UIEventSource<Partial<LayerConfigJson>> = new UIEventSource<
|
||||||
|
Partial<LayerConfigJson>
|
||||||
|
>({})
|
||||||
|
|
||||||
constructor(schema: ConfigMeta[]) {
|
constructor(schema: ConfigMeta[]) {
|
||||||
this.schema = schema
|
this.schema = schema
|
||||||
this.osmConnection = new OsmConnection({})
|
this.osmConnection = new OsmConnection({})
|
||||||
|
this.featureSwitches = {
|
||||||
|
featureSwitchIsDebugging: new UIEventSource<boolean>(true),
|
||||||
|
}
|
||||||
|
this.configuration.addCallback((config) => console.log("Current config is", config))
|
||||||
|
}
|
||||||
|
|
||||||
|
public register(path: ReadonlyArray<string | number>, value: Store<string>) {
|
||||||
|
value.addCallbackAndRun((v) => {
|
||||||
|
let entry = this.configuration.data
|
||||||
|
for (let i = 0; i < path.length - 1; i++) {
|
||||||
|
const breadcrumb = path[i]
|
||||||
|
if (entry[breadcrumb] === undefined) {
|
||||||
|
entry[breadcrumb] = typeof path[i + 1] === "number" ? [] : {}
|
||||||
|
}
|
||||||
|
entry = entry[breadcrumb]
|
||||||
|
}
|
||||||
|
if (v) {
|
||||||
|
entry[path.at(-1)] = v
|
||||||
|
} else if (entry) {
|
||||||
|
delete entry[path.at(-1)]
|
||||||
|
}
|
||||||
|
this.configuration.ping()
|
||||||
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
public getSchemaStartingWith(path: string[]) {
|
public getSchemaStartingWith(path: string[]) {
|
||||||
|
|
|
@ -3,47 +3,79 @@
|
||||||
import type {ConfigMeta} from "./configMeta";
|
import type {ConfigMeta} from "./configMeta";
|
||||||
import {UIEventSource} from "../../Logic/UIEventSource";
|
import {UIEventSource} from "../../Logic/UIEventSource";
|
||||||
import SchemaBasedInput from "./SchemaBasedInput.svelte";
|
import SchemaBasedInput from "./SchemaBasedInput.svelte";
|
||||||
|
import SchemaBasedField from "./SchemaBasedField.svelte";
|
||||||
|
|
||||||
export let state: EditLayerState
|
export let state: EditLayerState
|
||||||
export let schema: ConfigMeta
|
export let schema: ConfigMeta
|
||||||
|
|
||||||
|
let title = schema.path.at(-1)
|
||||||
|
let singular = title
|
||||||
|
if (title.endsWith("s")) {
|
||||||
|
singular = title.slice(0, title.length - 1)
|
||||||
|
}
|
||||||
|
let article = "a"
|
||||||
|
if (singular.match(/^[aeoui]/)) {
|
||||||
|
article = "an"
|
||||||
|
}
|
||||||
export let path: (string | number)[] = []
|
export let path: (string | number)[] = []
|
||||||
|
|
||||||
const subparts = state.getSchemaStartingWith(schema.path)
|
const subparts = state.getSchemaStartingWith(schema.path)
|
||||||
console.log("Got array:", {schema, subparts})
|
|
||||||
|
console.log("Subparts for", schema.path, " are", subparts)
|
||||||
|
|
||||||
let createdItems = 0
|
let createdItems = 0
|
||||||
/**
|
/**
|
||||||
* Keeps track of the items.
|
* Keeps track of the items.
|
||||||
* We keep a single string (stringified 'createdItems') to make sure the order is corrects
|
* We keep a single string (stringified 'createdItems') to make sure the order is corrects
|
||||||
*/
|
*/
|
||||||
export let values: UIEventSource<string[]> = new UIEventSource<string[]>([])
|
export let values: UIEventSource<number[]> = new UIEventSource<number[]>([])
|
||||||
|
|
||||||
function createItem() {
|
function createItem() {
|
||||||
values.data.push("" + createdItems)
|
values.data.push(createdItems)
|
||||||
createdItems++
|
createdItems++
|
||||||
values.ping()
|
values.ping()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function fusePath(i: number, subpartPath: string[]): (string | number)[] {
|
||||||
|
const newPath = [...path, i]
|
||||||
|
const toAdd = [...subpartPath]
|
||||||
|
for (const part of path) {
|
||||||
|
if (toAdd[0] === part) {
|
||||||
|
toAdd.splice(0, 1)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
newPath.push(...toAdd)
|
||||||
|
return newPath
|
||||||
|
}
|
||||||
|
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
|
||||||
<div class="pl-2">
|
<div class="pl-2">
|
||||||
<h3>{schema.path.at(-1)}</h3>
|
<h3>{schema.path.at(-1)}</h3>
|
||||||
|
|
||||||
<span class="subtle">
|
{#if subparts.length > 0}
|
||||||
{schema.description}
|
<span class="subtle">
|
||||||
</span>
|
{schema.description}
|
||||||
|
</span>
|
||||||
|
{/if}
|
||||||
|
|
||||||
{#if $values.length === 0}
|
{#if $values.length === 0}
|
||||||
No values are defined
|
No values are defined
|
||||||
|
{:else if subparts.length === 0}
|
||||||
|
<!-- We need an array of values, so we use the typehint of the _parent_ element as field -->
|
||||||
|
{#each $values as value (value)}
|
||||||
|
<SchemaBasedField {state} {schema} path={[...path, value]}/>
|
||||||
|
{/each}
|
||||||
{:else}
|
{:else}
|
||||||
{#each $values as value (value)}
|
{#each $values as value (value)}
|
||||||
|
<h3>{singular} {value}</h3>
|
||||||
<div class="border border-black">
|
<div class="border border-black">
|
||||||
{#each subparts as subpart}
|
{#each subparts as subpart}
|
||||||
<SchemaBasedInput {state} path = {[...path, value, ...subpart.path]} schema={subpart}/>
|
<SchemaBasedInput {state} path={fusePath(value, subpart.path)} schema={subpart}/>
|
||||||
{/each}
|
{/each}
|
||||||
</div>
|
</div>
|
||||||
{/each}
|
{/each}
|
||||||
{/if}
|
{/if}
|
||||||
<button on:click={createItem}>Add an entry</button>
|
<button on:click={createItem}>Add {article} {singular}</button>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -16,9 +16,9 @@
|
||||||
export let schema: ConfigMeta
|
export let schema: ConfigMeta
|
||||||
let value = new UIEventSource<string>(undefined)
|
let value = new UIEventSource<string>(undefined)
|
||||||
let feedback = new UIEventSource<Translation>(undefined)
|
let feedback = new UIEventSource<Translation>(undefined)
|
||||||
|
|
||||||
const configJson: QuestionableTagRenderingConfigJson = {
|
const configJson: QuestionableTagRenderingConfigJson = {
|
||||||
id: schema.path.join("_"),
|
id: path.join("_"),
|
||||||
render: schema.hints.inline ?? schema.path.at(-1) + ": <b>{value}</b>",
|
render: schema.hints.inline ?? schema.path.at(-1) + ": <b>{value}</b>",
|
||||||
question: schema.hints.question,
|
question: schema.hints.question,
|
||||||
questionHint: schema.description,
|
questionHint: schema.description,
|
||||||
|
@ -44,6 +44,7 @@
|
||||||
err = e
|
err = e
|
||||||
}
|
}
|
||||||
let tags = new UIEventSource<Record<string, string>>({})
|
let tags = new UIEventSource<Record<string, string>>({})
|
||||||
|
state.register(path, tags.map(tgs => tgs["value"]))
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
{#if err !== undefined}
|
{#if err !== undefined}
|
||||||
|
|
|
@ -10,7 +10,6 @@
|
||||||
|
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<span class="subtle">{path.join(".")}</span>
|
|
||||||
{#if schema.type === "array"}
|
{#if schema.type === "array"}
|
||||||
<SchemaBasedArray {path} {state} {schema}/>
|
<SchemaBasedArray {path} {state} {schema}/>
|
||||||
{:else}
|
{:else}
|
||||||
|
|
|
@ -34211,11 +34211,11 @@
|
||||||
],
|
],
|
||||||
"required": true,
|
"required": true,
|
||||||
"hints": {
|
"hints": {
|
||||||
"typehint": "simpletag",
|
"typehint": "simple_tag",
|
||||||
"question": "What tag should be added to the new object?"
|
"question": "What tag should be added to the new object?"
|
||||||
},
|
},
|
||||||
"type": "array",
|
"type": "array",
|
||||||
"description": "The tags to add. It determines the icon too.\nUse <code>key=value</code>\n"
|
"description": "A single tag (encoded as <code>key=value</code>) out of all the tags to add onto the newly created point.\nNote that the icon in the UI will be chosen automatically based on the tags provided here.\n"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"path": [
|
"path": [
|
||||||
|
@ -34223,7 +34223,9 @@
|
||||||
"description"
|
"description"
|
||||||
],
|
],
|
||||||
"required": false,
|
"required": false,
|
||||||
"hints": {},
|
"hints": {
|
||||||
|
"question": "How would you describe this feature?"
|
||||||
|
},
|
||||||
"type": [
|
"type": [
|
||||||
{
|
{
|
||||||
"$ref": "#/definitions/Record<string,string>"
|
"$ref": "#/definitions/Record<string,string>"
|
||||||
|
@ -34232,7 +34234,7 @@
|
||||||
"type": "string"
|
"type": "string"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"description": "The _first sentence_ of the description is shown on the button of the `add` menu.\nThe full description is shown in the confirmation dialog.\n\n(The first sentence is until the first '.'-character in the description)"
|
"description": "An extra explanation of what the feature is, if it is not immediately clear from the title alone.\n\nThe _first sentence_ of the description is shown on the button of the `add` menu.\nThe full description is shown in the confirmation dialog.\n\n(The first sentence is until the first '.'-character in the description)\n"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"path": [
|
"path": [
|
||||||
|
@ -34241,10 +34243,11 @@
|
||||||
],
|
],
|
||||||
"required": false,
|
"required": false,
|
||||||
"hints": {
|
"hints": {
|
||||||
"typehint": "image"
|
"typehint": "image",
|
||||||
|
"question": "What is the URL of an image showing such a feature?"
|
||||||
},
|
},
|
||||||
"type": "array",
|
"type": "array",
|
||||||
"description": "Example images, which show real-life pictures of what such a feature might look like\n"
|
"description": "The URL of an example image which shows a real-life example of what such a feature might look like.\n"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"path": [
|
"path": [
|
||||||
|
|
|
@ -36255,11 +36255,11 @@
|
||||||
],
|
],
|
||||||
"required": true,
|
"required": true,
|
||||||
"hints": {
|
"hints": {
|
||||||
"typehint": "simpletag",
|
"typehint": "simple_tag",
|
||||||
"question": "What tag should be added to the new object?"
|
"question": "What tag should be added to the new object?"
|
||||||
},
|
},
|
||||||
"type": "array",
|
"type": "array",
|
||||||
"description": "The tags to add. It determines the icon too.\nUse <code>key=value</code>\n"
|
"description": "A single tag (encoded as <code>key=value</code>) out of all the tags to add onto the newly created point.\nNote that the icon in the UI will be chosen automatically based on the tags provided here.\n"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"path": [
|
"path": [
|
||||||
|
@ -36268,7 +36268,9 @@
|
||||||
"description"
|
"description"
|
||||||
],
|
],
|
||||||
"required": false,
|
"required": false,
|
||||||
"hints": {},
|
"hints": {
|
||||||
|
"question": "How would you describe this feature?"
|
||||||
|
},
|
||||||
"type": [
|
"type": [
|
||||||
{
|
{
|
||||||
"$ref": "#/definitions/Record<string,string>"
|
"$ref": "#/definitions/Record<string,string>"
|
||||||
|
@ -36277,7 +36279,7 @@
|
||||||
"type": "string"
|
"type": "string"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"description": "The _first sentence_ of the description is shown on the button of the `add` menu.\nThe full description is shown in the confirmation dialog.\n\n(The first sentence is until the first '.'-character in the description)"
|
"description": "An extra explanation of what the feature is, if it is not immediately clear from the title alone.\n\nThe _first sentence_ of the description is shown on the button of the `add` menu.\nThe full description is shown in the confirmation dialog.\n\n(The first sentence is until the first '.'-character in the description)\n"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"path": [
|
"path": [
|
||||||
|
@ -36287,10 +36289,11 @@
|
||||||
],
|
],
|
||||||
"required": false,
|
"required": false,
|
||||||
"hints": {
|
"hints": {
|
||||||
"typehint": "image"
|
"typehint": "image",
|
||||||
|
"question": "What is the URL of an image showing such a feature?"
|
||||||
},
|
},
|
||||||
"type": "array",
|
"type": "array",
|
||||||
"description": "Example images, which show real-life pictures of what such a feature might look like\n"
|
"description": "The URL of an example image which shows a real-life example of what such a feature might look like.\n"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"path": [
|
"path": [
|
||||||
|
@ -80113,11 +80116,11 @@
|
||||||
],
|
],
|
||||||
"required": true,
|
"required": true,
|
||||||
"hints": {
|
"hints": {
|
||||||
"typehint": "simpletag",
|
"typehint": "simple_tag",
|
||||||
"question": "What tag should be added to the new object?"
|
"question": "What tag should be added to the new object?"
|
||||||
},
|
},
|
||||||
"type": "array",
|
"type": "array",
|
||||||
"description": "The tags to add. It determines the icon too.\nUse <code>key=value</code>\n"
|
"description": "A single tag (encoded as <code>key=value</code>) out of all the tags to add onto the newly created point.\nNote that the icon in the UI will be chosen automatically based on the tags provided here.\n"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"path": [
|
"path": [
|
||||||
|
@ -80127,7 +80130,9 @@
|
||||||
"description"
|
"description"
|
||||||
],
|
],
|
||||||
"required": false,
|
"required": false,
|
||||||
"hints": {},
|
"hints": {
|
||||||
|
"question": "How would you describe this feature?"
|
||||||
|
},
|
||||||
"type": [
|
"type": [
|
||||||
{
|
{
|
||||||
"$ref": "#/definitions/Record<string,string>"
|
"$ref": "#/definitions/Record<string,string>"
|
||||||
|
@ -80136,7 +80141,7 @@
|
||||||
"type": "string"
|
"type": "string"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"description": "The _first sentence_ of the description is shown on the button of the `add` menu.\nThe full description is shown in the confirmation dialog.\n\n(The first sentence is until the first '.'-character in the description)"
|
"description": "An extra explanation of what the feature is, if it is not immediately clear from the title alone.\n\nThe _first sentence_ of the description is shown on the button of the `add` menu.\nThe full description is shown in the confirmation dialog.\n\n(The first sentence is until the first '.'-character in the description)\n"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"path": [
|
"path": [
|
||||||
|
@ -80147,10 +80152,11 @@
|
||||||
],
|
],
|
||||||
"required": false,
|
"required": false,
|
||||||
"hints": {
|
"hints": {
|
||||||
"typehint": "image"
|
"typehint": "image",
|
||||||
|
"question": "What is the URL of an image showing such a feature?"
|
||||||
},
|
},
|
||||||
"type": "array",
|
"type": "array",
|
||||||
"description": "Example images, which show real-life pictures of what such a feature might look like\n"
|
"description": "The URL of an example image which shows a real-life example of what such a feature might look like.\n"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"path": [
|
"path": [
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue