diff --git a/Models/ThemeConfig/Conversion/PrepareLayer.ts b/Models/ThemeConfig/Conversion/PrepareLayer.ts index 0bb635ef6d..eadd9f0863 100644 --- a/Models/ThemeConfig/Conversion/PrepareLayer.ts +++ b/Models/ThemeConfig/Conversion/PrepareLayer.ts @@ -228,10 +228,13 @@ class ExpandTagRendering extends Conversion< let found: TagRenderingConfigJson = Utils.Clone(matchingTrs[i]) if (this._options?.applyCondition) { // The matched tagRenderings are 'stolen' from another layer. This means that they must match the layer condition before being shown - if (found.condition === undefined) { - found.condition = layer.source.osmTags - } else { - found.condition = { and: [found.condition, layer.source.osmTags] } + + if (typeof layer.source !== "string") { + if (found.condition === undefined) { + found.condition = layer.source.osmTags + } else { + found.condition = { and: [found.condition, layer.source.osmTags] } + } } } diff --git a/Models/ThemeConfig/Conversion/PrepareTheme.ts b/Models/ThemeConfig/Conversion/PrepareTheme.ts index ff9745db8c..03f6869c63 100644 --- a/Models/ThemeConfig/Conversion/PrepareTheme.ts +++ b/Models/ThemeConfig/Conversion/PrepareTheme.ts @@ -17,9 +17,9 @@ import Constants from "../../Constants" import CreateNoteImportLayer from "./CreateNoteImportLayer" import LayerConfig from "../LayerConfig" import { TagRenderingConfigJson } from "../Json/TagRenderingConfigJson" -import { SubstitutedTranslation } from "../../../UI/SubstitutedTranslation" import DependencyCalculator from "../DependencyCalculator" import { AddContextToTranslations } from "./AddContextToTranslations" +import ValidationUtils from "./ValidationUtils" class SubstituteLayer extends Conversion { private readonly _state: DesugaringContext @@ -322,31 +322,7 @@ export class AddMiniMap extends DesugaringStep { * AddMiniMap.hasMinimap({render: "Some random value {minimap}"}) // => false */ static hasMinimap(renderingConfig: TagRenderingConfigJson): boolean { - const translations: any[] = Utils.NoNull([ - renderingConfig.render, - ...(renderingConfig.mappings ?? []).map((m) => m.then), - ]) - for (let translation of translations) { - if (typeof translation == "string") { - translation = { "*": translation } - } - - for (const key in translation) { - if (!translation.hasOwnProperty(key)) { - continue - } - - const template = translation[key] - const parts = SubstitutedTranslation.ExtractSpecialComponents(template) - const hasMiniMap = parts - .filter((part) => part.special !== undefined) - .some((special) => special.special.func.funcName === "minimap") - if (hasMiniMap) { - return true - } - } - } - return false + return ValidationUtils.getSpecialVisualisations(renderingConfig).indexOf("minimap") >= 0 } convert(layerConfig: LayerConfigJson, context: string): { result: LayerConfigJson } { diff --git a/Models/ThemeConfig/Conversion/Validation.ts b/Models/ThemeConfig/Conversion/Validation.ts index 5c31778e6c..17cb85b081 100644 --- a/Models/ThemeConfig/Conversion/Validation.ts +++ b/Models/ThemeConfig/Conversion/Validation.ts @@ -15,7 +15,8 @@ import Svg from "../../../Svg" import FilterConfigJson from "../Json/FilterConfigJson" import DeleteConfig from "../DeleteConfig" import { QuestionableTagRenderingConfigJson } from "../Json/QuestionableTagRenderingConfigJson" -import ValidatedTextField from "../../../UI/Input/ValidatedTextField" +import Validators from "../../../UI/InputElement/Validators" +import xml2js from "xml2js" class ValidateLanguageCompleteness extends DesugaringStep { private readonly _languages: string[] @@ -619,36 +620,16 @@ class MiscTagRenderingChecks extends DesugaringStep { ': detected `special` on the top level. Did you mean `{"render":{ "special": ... }}`' ) } - if (json["question"] && !this._options?.noQuestionHintCheck) { - const question = Translations.T( - new TypedTranslation(json["question"]), - context + ".question" - ) - for (const lng of question.SupportedLanguages()) { - const html = document.createElement("p") - html.innerHTML = question.textFor(lng) - const divs = Array.from(html.getElementsByTagName("div")) - const spans = Array.from(html.getElementsByTagName("span")) - const brs = Array.from(html.getElementsByTagName("br")) - const subtles = Array.from(html.getElementsByClassName("subtle")) - if (divs.length + spans.length + brs.length + subtles.length > 0) { - warnings.push( - `At ${context}: the question for ${lng} contains a div, a span, a br or an element with class 'subtle'. Please, use a \`questionHint\` instead. - The question is: ${question.textFor(lng)}` - ) - } - } - } const freeformType = json["freeform"]?.["type"] if (freeformType) { - if (ValidatedTextField.AvailableTypes().indexOf(freeformType) < 0) { + if (Validators.AvailableTypes().indexOf(freeformType) < 0) { throw ( "At " + context + ".freeform.type is an unknown type: " + freeformType + "; try one of " + - ValidatedTextField.AvailableTypes().join(", ") + Validators.AvailableTypes().join(", ") ) } } @@ -942,13 +923,12 @@ export class ValidateFilter extends DesugaringStep { for (let i = 0; i < option.fields.length; i++) { const field = option.fields[i] const type = field.type ?? "string" - if (!ValidatedTextField.ForType(type) !== undefined) { - continue + if (Validators.AvailableTypes().find((t) => t === type) === undefined) { + const err = `Invalid filter: ${type} is not a valid textfield type (at ${context}.fields[${i}])\n\tTry one of ${Array.from( + Validators.AvailableTypes() + ).join(",")}` + errors.push(err) } - const err = `Invalid filter: ${type} is not a valid validated textfield type (at ${context}.fields[${i}])\n\tTry one of ${Array.from( - ValidatedTextField.AvailableTypes() - ).join(",")}` - errors.push(err) } } return { result: filter, errors } diff --git a/Models/ThemeConfig/Conversion/ValidationUtils.ts b/Models/ThemeConfig/Conversion/ValidationUtils.ts new file mode 100644 index 0000000000..37ecbac519 --- /dev/null +++ b/Models/ThemeConfig/Conversion/ValidationUtils.ts @@ -0,0 +1,36 @@ +import { TagRenderingConfigJson } from "../Json/TagRenderingConfigJson" +import { Utils } from "../../../Utils" +import SpecialVisualizations from "../../../UI/SpecialVisualizations" + +export default class ValidationUtils { + /** + * Gives all the (function names of) used special visualisations + * @param renderingConfig + */ + public static getSpecialVisualisations(renderingConfig: TagRenderingConfigJson): string[] { + const translations: any[] = Utils.NoNull([ + renderingConfig.render, + ...(renderingConfig.mappings ?? []).map((m) => m.then), + ]) + const all: string[] = [] + for (let translation of translations) { + if (typeof translation == "string") { + translation = { "*": translation } + } + + for (const key in translation) { + if (!translation.hasOwnProperty(key)) { + continue + } + + const template = translation[key] + const parts = SpecialVisualizations.constructSpecification(template) + const specials = parts + .filter((p) => typeof p !== "string") + .map((special) => special["func"].funcName) + all.push(...specials) + } + } + return all + } +} diff --git a/Models/ThemeConfig/DependencyCalculator.ts b/Models/ThemeConfig/DependencyCalculator.ts index 87dd961871..9262326f6b 100644 --- a/Models/ThemeConfig/DependencyCalculator.ts +++ b/Models/ThemeConfig/DependencyCalculator.ts @@ -1,8 +1,8 @@ -import { SubstitutedTranslation } from "../../UI/SubstitutedTranslation" import TagRenderingConfig from "./TagRenderingConfig" import { ExtraFuncParams, ExtraFunctions } from "../../Logic/ExtraFunctions" import LayerConfig from "./LayerConfig" import { SpecialVisualization } from "../../UI/SpecialVisualization" +import SpecialVisualizations from "../../UI/SpecialVisualizations" export default class DependencyCalculator { public static GetTagRenderingDependencies(tr: TagRenderingConfig): string[] { @@ -16,8 +16,9 @@ export default class DependencyCalculator { for (const part of parts) { const specialVizs: { func: SpecialVisualization; args: string[] }[] = - SubstitutedTranslation.ExtractSpecialComponents(part) - .map((o) => o.special) + SpecialVisualizations.constructSpecification(part) + .filter((p) => typeof p !== "string") + .map((p) => <{ func: SpecialVisualization; args: string[] }>p) .filter((o) => o?.func?.getLayerDependencies !== undefined) for (const specialViz of specialVizs) { deps.push(...specialViz.func.getLayerDependencies(specialViz.args)) diff --git a/Models/ThemeConfig/PointRenderingConfig.ts b/Models/ThemeConfig/PointRenderingConfig.ts index 876ff425ce..d89f09e3e1 100644 --- a/Models/ThemeConfig/PointRenderingConfig.ts +++ b/Models/ThemeConfig/PointRenderingConfig.ts @@ -89,9 +89,6 @@ export default class PointRenderingConfig extends WithContextLoader { this.iconSize = this.tr("iconSize", "40,40,center") this.label = this.tr("label", undefined) this.rotation = this.tr("rotation", "0") - if (json.pitchAlignment) { - console.log("Got a pitch alignment!", json.pitchAlignment) - } this.pitchAlignment = this.tr("pitchAlignment", "canvas") this.rotationAlignment = this.tr( "rotationAlignment", diff --git a/UI/InputElement/Validator.ts b/UI/InputElement/Validator.ts new file mode 100644 index 0000000000..711fae53a8 --- /dev/null +++ b/UI/InputElement/Validator.ts @@ -0,0 +1,56 @@ +import BaseUIElement from "../BaseUIElement" +import { Translation } from "../i18n/Translation" +import Translations from "../i18n/Translations" + +/** + * A 'TextFieldValidator' contains various methods to check and cleanup an entered value or to give feedback. + * They also double as an index of supported types for textfields in MapComplete + */ +export abstract class Validator { + public readonly name: string + /* + * An explanation for the theme builder. + * This can indicate which special input element is used, ... + * */ + public readonly explanation: string + /** + * What HTML-inputmode to use + */ + public readonly inputmode?: string + + constructor(name: string, explanation: string | BaseUIElement, inputmode?: string) { + this.name = name + this.inputmode = inputmode + if (this.name.endsWith("textfield")) { + this.name = this.name.substr(0, this.name.length - "TextField".length) + } + if (this.name.endsWith("textfielddef")) { + this.name = this.name.substr(0, this.name.length - "TextFieldDef".length) + } + if (typeof explanation === "string") { + this.explanation = explanation + } else { + this.explanation = explanation.AsMarkdown() + } + } + + /** + * Gets a piece of feedback. By default, validation. will be used, resulting in a generic 'not a valid '. + * However, inheritors might overwrite this to give more specific feedback + * @param s + */ + public getFeedback(s: string): Translation { + const tr = Translations.t.validation[this.name] + if (tr !== undefined) { + return tr["feedback"] + } + } + + public isValid(string: string, requestCountry: () => string): boolean { + return true + } + + public reformat(s: string, country?: () => string): string { + return s + } +} diff --git a/UI/InputElement/ValidatedTextField.ts b/UI/InputElement/Validators.ts similarity index 58% rename from UI/InputElement/ValidatedTextField.ts rename to UI/InputElement/Validators.ts index 3ed4946e00..25594d3b12 100644 --- a/UI/InputElement/ValidatedTextField.ts +++ b/UI/InputElement/Validators.ts @@ -1,77 +1,23 @@ -import BaseUIElement from "../BaseUIElement" -import Combine from "../Base/Combine" -import Title from "../Base/Title" -import Translations from "../i18n/Translations" -import { Translation } from "../i18n/Translation" -import WikidataValidator from "./Validators/WikidataValidator" +import { Validator } from "./Validator" import StringValidator from "./Validators/StringValidator" import TextValidator from "./Validators/TextValidator" import DateValidator from "./Validators/DateValidator" -import LengthValidator from "./Validators/LengthValidator" -import IntValidator from "./Validators/IntValidator" -import EmailValidator from "./Validators/EmailValidator" -import DirectionValidator from "./Validators/DirectionValidator" import NatValidator from "./Validators/NatValidator" -import OpeningHoursValidator from "./Validators/OpeningHoursValidator" -import PFloatValidator from "./Validators/PFloatValidator" -import ColorValidator from "./Validators/ColorValidator" -import PhoneValidator from "./Validators/PhoneValidator" -import UrlValidator from "./Validators/UrlValidator" -import FloatValidator from "./Validators/FloatValidator" +import IntValidator from "./Validators/IntValidator" +import LengthValidator from "./Validators/LengthValidator" +import DirectionValidator from "./Validators/DirectionValidator" +import WikidataValidator from "./Validators/WikidataValidator" import PNatValidator from "./Validators/PNatValidator" - -/** - * A 'TextFieldValidator' contains various methods to check and cleanup an entered value or to give feedback. - * They also double as an index of supported types for textfields in MapComplete - */ -export abstract class Validator { - public readonly name: string - /* - * An explanation for the theme builder. - * This can indicate which special input element is used, ... - * */ - public readonly explanation: string - /** - * What HTML-inputmode to use - */ - public readonly inputmode?: string - - constructor(name: string, explanation: string | BaseUIElement, inputmode?: string) { - this.name = name - this.inputmode = inputmode - if (this.name.endsWith("textfield")) { - this.name = this.name.substr(0, this.name.length - "TextField".length) - } - if (this.name.endsWith("textfielddef")) { - this.name = this.name.substr(0, this.name.length - "TextFieldDef".length) - } - if (typeof explanation === "string") { - this.explanation = explanation - } else { - this.explanation = explanation.AsMarkdown() - } - } - - /** - * Gets a piece of feedback. By default, validation. will be used, resulting in a generic 'not a valid '. - * However, inheritors might overwrite this to give more specific feedback - * @param s - */ - public getFeedback(s: string): Translation { - const tr = Translations.t.validation[this.name] - if (tr !== undefined) { - return tr["feedback"] - } - } - - public isValid(string: string, requestCountry: () => string): boolean { - return true - } - - public reformat(s: string, country?: () => string): string { - return s - } -} +import FloatValidator from "./Validators/FloatValidator" +import PFloatValidator from "./Validators/PFloatValidator" +import EmailValidator from "./Validators/EmailValidator" +import UrlValidator from "./Validators/UrlValidator" +import PhoneValidator from "./Validators/PhoneValidator" +import OpeningHoursValidator from "./Validators/OpeningHoursValidator" +import ColorValidator from "./Validators/ColorValidator" +import BaseUIElement from "../BaseUIElement" +import Combine from "../Base/Combine" +import Title from "../Base/Title" export default class Validators { private static readonly AllValidators: ReadonlyArray = [ diff --git a/UI/InputElement/Validators/ColorValidator.ts b/UI/InputElement/Validators/ColorValidator.ts index 2022edecbd..88dd5a893c 100644 --- a/UI/InputElement/Validators/ColorValidator.ts +++ b/UI/InputElement/Validators/ColorValidator.ts @@ -1,4 +1,4 @@ -import { Validator } from "../ValidatedTextField" +import { Validator } from "../Validator" export default class ColorValidator extends Validator { constructor() { diff --git a/UI/InputElement/Validators/DateValidator.ts b/UI/InputElement/Validators/DateValidator.ts index 1ebbd67bc1..a67e371dd1 100644 --- a/UI/InputElement/Validators/DateValidator.ts +++ b/UI/InputElement/Validators/DateValidator.ts @@ -1,4 +1,4 @@ -import { Validator } from "../ValidatedTextField" +import { Validator } from "../Validator" export default class DateValidator extends Validator { constructor() { diff --git a/UI/InputElement/Validators/DirectionValidator.ts b/UI/InputElement/Validators/DirectionValidator.ts index 582edf58a2..34ae9cd7e1 100644 --- a/UI/InputElement/Validators/DirectionValidator.ts +++ b/UI/InputElement/Validators/DirectionValidator.ts @@ -1,5 +1,5 @@ -import { Validator } from "../ValidatedTextField" -import IntValidator from "./IntValidator"; +import IntValidator from "./IntValidator" +import { Validator } from "../Validator" export default class DirectionValidator extends IntValidator { constructor() { @@ -13,5 +13,4 @@ export default class DirectionValidator extends IntValidator { const n = Number(str) % 360 return "" + n } - } diff --git a/UI/InputElement/Validators/EmailValidator.ts b/UI/InputElement/Validators/EmailValidator.ts index 8702bdff89..04a4d82bd0 100644 --- a/UI/InputElement/Validators/EmailValidator.ts +++ b/UI/InputElement/Validators/EmailValidator.ts @@ -1,7 +1,7 @@ -import { Validator } from "../ValidatedTextField.js" import { Translation } from "../../i18n/Translation.js" import Translations from "../../i18n/Translations.js" import * as emailValidatorLibrary from "email-validator" +import { Validator } from "../Validator" export default class EmailValidator extends Validator { constructor() { super("email", "An email adress", "email") diff --git a/UI/InputElement/Validators/FloatValidator.ts b/UI/InputElement/Validators/FloatValidator.ts index 1bcf554045..f984a9fc07 100644 --- a/UI/InputElement/Validators/FloatValidator.ts +++ b/UI/InputElement/Validators/FloatValidator.ts @@ -1,6 +1,6 @@ import { Translation } from "../../i18n/Translation" import Translations from "../../i18n/Translations" -import { Validator } from "../ValidatedTextField" +import { Validator } from "../Validator" export default class FloatValidator extends Validator { inputmode = "decimal" diff --git a/UI/InputElement/Validators/IntValidator.ts b/UI/InputElement/Validators/IntValidator.ts index 0b349cbe82..666605ee8d 100644 --- a/UI/InputElement/Validators/IntValidator.ts +++ b/UI/InputElement/Validators/IntValidator.ts @@ -1,6 +1,6 @@ import { Translation } from "../../i18n/Translation" import Translations from "../../i18n/Translations" -import { Validator } from "../ValidatedTextField" +import { Validator } from "../Validator" export default class IntValidator extends Validator { constructor(name?: string, explanation?: string) { diff --git a/UI/InputElement/Validators/LengthValidator.ts b/UI/InputElement/Validators/LengthValidator.ts index c9e879953b..4151b2aa80 100644 --- a/UI/InputElement/Validators/LengthValidator.ts +++ b/UI/InputElement/Validators/LengthValidator.ts @@ -1,4 +1,4 @@ -import { Validator } from "../ValidatedTextField" +import { Validator } from "../Validator" export default class LengthValidator extends Validator { constructor() { diff --git a/UI/InputElement/Validators/OpeningHoursValidator.ts b/UI/InputElement/Validators/OpeningHoursValidator.ts index 85760df64a..2c264238fe 100644 --- a/UI/InputElement/Validators/OpeningHoursValidator.ts +++ b/UI/InputElement/Validators/OpeningHoursValidator.ts @@ -1,7 +1,7 @@ -import { Validator } from "../ValidatedTextField" import Combine from "../../Base/Combine" import Title from "../../Base/Title" import Table from "../../Base/Table" +import { Validator } from "../Validator" export default class OpeningHoursValidator extends Validator { constructor() { diff --git a/UI/InputElement/Validators/PFloatValidator.ts b/UI/InputElement/Validators/PFloatValidator.ts index 9501631a89..cc5d108a9b 100644 --- a/UI/InputElement/Validators/PFloatValidator.ts +++ b/UI/InputElement/Validators/PFloatValidator.ts @@ -1,6 +1,6 @@ import { Translation } from "../../i18n/Translation" import Translations from "../../i18n/Translations" -import { Validator } from "../ValidatedTextField" +import { Validator } from "../Validator" export default class PFloatValidator extends Validator { constructor() { diff --git a/UI/InputElement/Validators/PhoneValidator.ts b/UI/InputElement/Validators/PhoneValidator.ts index db4fa3d26e..9ab3b183ac 100644 --- a/UI/InputElement/Validators/PhoneValidator.ts +++ b/UI/InputElement/Validators/PhoneValidator.ts @@ -1,5 +1,5 @@ -import { Validator } from "../ValidatedTextField" import { parsePhoneNumberFromString } from "libphonenumber-js" +import { Validator } from "../Validator" export default class PhoneValidator extends Validator { constructor() { diff --git a/UI/InputElement/Validators/StringValidator.ts b/UI/InputElement/Validators/StringValidator.ts index b058086804..9da065c9a3 100644 --- a/UI/InputElement/Validators/StringValidator.ts +++ b/UI/InputElement/Validators/StringValidator.ts @@ -1,8 +1,7 @@ -import { Validator } from "../ValidatedTextField" +import { Validator } from "../Validator" export default class StringValidator extends Validator { constructor() { super("string", "A simple piece of text") } - } diff --git a/UI/InputElement/Validators/TextValidator.ts b/UI/InputElement/Validators/TextValidator.ts index cad3b997a7..52d30271d4 100644 --- a/UI/InputElement/Validators/TextValidator.ts +++ b/UI/InputElement/Validators/TextValidator.ts @@ -1,4 +1,4 @@ -import { Validator } from "../ValidatedTextField" +import { Validator } from "../Validator" export default class TextValidator extends Validator { constructor() { diff --git a/UI/InputElement/Validators/UrlValidator.ts b/UI/InputElement/Validators/UrlValidator.ts index 16e9172f70..3b346852ea 100644 --- a/UI/InputElement/Validators/UrlValidator.ts +++ b/UI/InputElement/Validators/UrlValidator.ts @@ -1,4 +1,4 @@ -import { Validator } from "../ValidatedTextField" +import { Validator } from "../Validator" export default class UrlValidator extends Validator { constructor() { diff --git a/UI/InputElement/Validators/WikidataValidator.ts b/UI/InputElement/Validators/WikidataValidator.ts index fa1588e378..6a6cf12dfe 100644 --- a/UI/InputElement/Validators/WikidataValidator.ts +++ b/UI/InputElement/Validators/WikidataValidator.ts @@ -6,7 +6,7 @@ import { UIEventSource } from "../../../Logic/UIEventSource" import Locale from "../../i18n/Locale" import { Utils } from "../../../Utils" import WikidataSearchBox from "../../Wikipedia/WikidataSearchBox" -import { Validator } from "../ValidatedTextField" +import { Validator } from "../Validator" export default class WikidataValidator extends Validator { constructor() { diff --git a/UI/Popup/ImportButton.ts b/UI/Popup/ImportButton.ts index b2ff72073b..9f5c0bc36b 100644 --- a/UI/Popup/ImportButton.ts +++ b/UI/Popup/ImportButton.ts @@ -1,47 +1,49 @@ -import BaseUIElement from "../BaseUIElement"; -import { SubtleButton } from "../Base/SubtleButton"; -import { UIEventSource } from "../../Logic/UIEventSource"; -import Combine from "../Base/Combine"; -import { VariableUiElement } from "../Base/VariableUIElement"; -import Translations from "../i18n/Translations"; -import Toggle from "../Input/Toggle"; -import CreateNewNodeAction from "../../Logic/Osm/Actions/CreateNewNodeAction"; -import Loading from "../Base/Loading"; -import { OsmConnection } from "../../Logic/Osm/OsmConnection"; -import Lazy from "../Base/Lazy"; -import ConfirmLocationOfPoint from "../NewPoint/ConfirmLocationOfPoint"; -import Img from "../Base/Img"; -import FilteredLayer from "../../Models/FilteredLayer"; -import { FixedUiElement } from "../Base/FixedUiElement"; -import Svg from "../../Svg"; -import { Utils } from "../../Utils"; -import StaticFeatureSource from "../../Logic/FeatureSource/Sources/StaticFeatureSource"; -import CreateWayWithPointReuseAction, { MergePointConfig } from "../../Logic/Osm/Actions/CreateWayWithPointReuseAction"; -import OsmChangeAction, { OsmCreateAction } from "../../Logic/Osm/Actions/OsmChangeAction"; -import FeatureSource from "../../Logic/FeatureSource/FeatureSource"; -import { OsmObject, OsmWay } from "../../Logic/Osm/OsmObject"; -import { PresetInfo } from "../BigComponents/SimpleAddUI"; -import { TagUtils } from "../../Logic/Tags/TagUtils"; -import { And } from "../../Logic/Tags/And"; -import ReplaceGeometryAction from "../../Logic/Osm/Actions/ReplaceGeometryAction"; -import CreateMultiPolygonWithPointReuseAction from "../../Logic/Osm/Actions/CreateMultiPolygonWithPointReuseAction"; -import { Tag } from "../../Logic/Tags/Tag"; -import TagApplyButton from "./TagApplyButton"; -import LayerConfig from "../../Models/ThemeConfig/LayerConfig"; -import conflation_json from "../../assets/layers/conflation/conflation.json"; -import { GeoOperations } from "../../Logic/GeoOperations"; -import { LoginToggle } from "./LoginButton"; -import { AutoAction } from "./AutoApplyButton"; -import Hash from "../../Logic/Web/Hash"; -import { PreciseInput } from "../../Models/ThemeConfig/PresetConfig"; -import { SpecialVisualization, SpecialVisualizationState } from "../SpecialVisualization"; -import Maproulette from "../../Logic/Maproulette"; -import { Feature, Point } from "geojson"; -import { LayerConfigJson } from "../../Models/ThemeConfig/Json/LayerConfigJson"; -import ShowDataLayer from "../Map/ShowDataLayer"; -import { MapLibreAdaptor } from "../Map/MapLibreAdaptor"; -import SvelteUIElement from "../Base/SvelteUIElement"; -import MaplibreMap from "../Map/MaplibreMap.svelte"; +import BaseUIElement from "../BaseUIElement" +import { SubtleButton } from "../Base/SubtleButton" +import { UIEventSource } from "../../Logic/UIEventSource" +import Combine from "../Base/Combine" +import { VariableUiElement } from "../Base/VariableUIElement" +import Translations from "../i18n/Translations" +import Toggle from "../Input/Toggle" +import CreateNewNodeAction from "../../Logic/Osm/Actions/CreateNewNodeAction" +import Loading from "../Base/Loading" +import { OsmConnection } from "../../Logic/Osm/OsmConnection" +import Lazy from "../Base/Lazy" +import ConfirmLocationOfPoint from "../NewPoint/ConfirmLocationOfPoint" +import Img from "../Base/Img" +import FilteredLayer from "../../Models/FilteredLayer" +import { FixedUiElement } from "../Base/FixedUiElement" +import Svg from "../../Svg" +import { Utils } from "../../Utils" +import StaticFeatureSource from "../../Logic/FeatureSource/Sources/StaticFeatureSource" +import CreateWayWithPointReuseAction, { + MergePointConfig, +} from "../../Logic/Osm/Actions/CreateWayWithPointReuseAction" +import OsmChangeAction, { OsmCreateAction } from "../../Logic/Osm/Actions/OsmChangeAction" +import FeatureSource from "../../Logic/FeatureSource/FeatureSource" +import { OsmObject, OsmWay } from "../../Logic/Osm/OsmObject" +import { PresetInfo } from "../BigComponents/SimpleAddUI" +import { TagUtils } from "../../Logic/Tags/TagUtils" +import { And } from "../../Logic/Tags/And" +import ReplaceGeometryAction from "../../Logic/Osm/Actions/ReplaceGeometryAction" +import CreateMultiPolygonWithPointReuseAction from "../../Logic/Osm/Actions/CreateMultiPolygonWithPointReuseAction" +import { Tag } from "../../Logic/Tags/Tag" +import TagApplyButton from "./TagApplyButton" +import LayerConfig from "../../Models/ThemeConfig/LayerConfig" +import conflation_json from "../../assets/layers/conflation/conflation.json" +import { GeoOperations } from "../../Logic/GeoOperations" +import { LoginToggle } from "./LoginButton" +import { AutoAction } from "./AutoApplyButton" +import Hash from "../../Logic/Web/Hash" +import { PreciseInput } from "../../Models/ThemeConfig/PresetConfig" +import { SpecialVisualization, SpecialVisualizationState } from "../SpecialVisualization" +import Maproulette from "../../Logic/Maproulette" +import { Feature, Point } from "geojson" +import { LayerConfigJson } from "../../Models/ThemeConfig/Json/LayerConfigJson" +import ShowDataLayer from "../Map/ShowDataLayer" +import { MapLibreAdaptor } from "../Map/MapLibreAdaptor" +import SvelteUIElement from "../Base/SvelteUIElement" +import MaplibreMap from "../Map/MaplibreMap.svelte" /** * A helper class for the various import-flows. @@ -377,13 +379,6 @@ export class ConflateButton extends AbstractImportButton { ) } - getLayerDependencies(argsRaw: string[]): string[] { - const deps = super.getLayerDependencies(argsRaw) - // Force 'type_node' as dependency - deps.push("type_node") - return deps - } - constructElement( state: SpecialVisualizationState, args: { @@ -543,12 +538,6 @@ export class ImportWayButton extends AbstractImportButton implements AutoAction return type === "LineString" || type === "Polygon" } - getLayerDependencies(argsRaw: string[]): string[] { - const deps = super.getLayerDependencies(argsRaw) - deps.push("type_node") - return deps - } - constructElement( state: SpecialVisualizationState, args, @@ -565,7 +554,7 @@ export class ImportWayButton extends AbstractImportButton implements AutoAction // Upload the way to OSM const mergeConfigs = this.GetMergeConfig(args) - let action: OsmCreateAction & {getPreview?: any} = ImportWayButton.CreateAction( + let action: OsmCreateAction & { getPreview?: any } = ImportWayButton.CreateAction( feature, args, state, @@ -751,7 +740,7 @@ export class ImportPointButton extends AbstractImportButton { boundsFactor: 3, } - const [lon, lat] = <[number,number]> feature.geometry.coordinates + const [lon, lat] = <[number, number]>feature.geometry.coordinates return new ConfirmLocationOfPoint( state, state.guistate.filterViewIsOpened, diff --git a/assets/layers/cycleways_and_roads/cycleways_and_roads.json b/assets/layers/cycleways_and_roads/cycleways_and_roads.json index 2b05545bf7..0d2cdd78c9 100644 --- a/assets/layers/cycleways_and_roads/cycleways_and_roads.json +++ b/assets/layers/cycleways_and_roads/cycleways_and_roads.json @@ -1694,4 +1694,4 @@ "fr": "Toutes les infrastructures sur lesquelles quelqu'un peut rouler, accompagnées de questions sur cette infrastructure", "ca": "Totes les infraestructures per les quals algú pot ciclar, acompanyades de preguntes sobre aquesta infraestructura" } -} \ No newline at end of file +} diff --git a/scripts/generateLayerOverview.ts b/scripts/generateLayerOverview.ts index f98e3fac46..ee5bc21887 100644 --- a/scripts/generateLayerOverview.ts +++ b/scripts/generateLayerOverview.ts @@ -4,7 +4,6 @@ import licenses from "../assets/generated/license_info.json" import { LayoutConfigJson } from "../Models/ThemeConfig/Json/LayoutConfigJson" import { LayerConfigJson } from "../Models/ThemeConfig/Json/LayerConfigJson" import Constants from "../Models/Constants" -import * as fakedom from "fake-dom" import { DetectDuplicateFilters, DoesImageExist, @@ -226,9 +225,6 @@ class LayerOverviewUtils { } main(args: string[]) { - if (fakedom === undefined) { - throw "Fakedom not initialized" - } const forceReload = args.some((a) => a == "--force") const licensePaths = new Set() @@ -339,7 +335,7 @@ class LayerOverviewUtils { const context = "While building builtin layer " + sharedLayerPath const fixed = prepLayer.convertStrict(parsed, context) - if (fixed.source.osmTags["and"] === undefined) { + if (typeof fixed.source !== "string" && fixed.source.osmTags["and"] === undefined) { fixed.source.osmTags = { and: [fixed.source.osmTags] } }