" + this.languagePicker.Render() + diff --git a/Customizations/Questions/EmailQuestion.ts b/Customizations/Questions/EmailQuestion.ts new file mode 100644 index 0000000..ee99bd4 --- /dev/null +++ b/Customizations/Questions/EmailQuestion.ts @@ -0,0 +1,18 @@ +import {TagRenderingOptions} from "../TagRendering"; +import {UIElement} from "../../UI/UIElement"; +import Translations from "../../UI/i18n/Translations"; + +export class EmailQuestion extends TagRenderingOptions { + + constructor(category: string | UIElement) { + super({ + question: Translations.t.general.questions.emailOf.Subs({category: category}), + freeform: { + renderTemplate: Translations.t.general.questions.emailIs.Subs({category: category}), + template: "$email$", + key: "email" + } + }); + } + +} \ No newline at end of file diff --git a/Customizations/Questions/Website.ts b/Customizations/Questions/Website.ts index 34051d3..ac0b67c 100644 --- a/Customizations/Questions/Website.ts +++ b/Customizations/Questions/Website.ts @@ -9,8 +9,8 @@ export default class Website extends TagRenderingOptions { question: Translations.t.general.questions.websiteOf.Subs({category: category}), freeform: { renderTemplate: Translations.t.general.questions.websiteIs, - template: "$phone$", - key: "phone" + template: "website", + key: "website" } }); } diff --git a/Customizations/TagRendering.ts b/Customizations/TagRendering.ts index 3316421..a111a46 100644 --- a/Customizations/TagRendering.ts +++ b/Customizations/TagRendering.ts @@ -360,9 +360,11 @@ class TagRendering extends UIElement implements TagDependantUIElement { return undefined; } - const prepost = Translations.W(freeform.template).InnerRender().split("$"); + const prepost = Translations.W(freeform.template).InnerRender() + .replace("$$$","$string$") + .split("$"); const type = prepost[1]; - + let isValid = TagRenderingOptions.inputValidation[type]; if (isValid === undefined) { isValid = (str) => true; diff --git a/Helpers.ts b/Helpers.ts index 22e7d38..75336dd 100644 --- a/Helpers.ts +++ b/Helpers.ts @@ -1,6 +1,5 @@ -import {OsmConnection} from "./Logic/OsmConnection"; -import {Changes} from "./Logic/Changes"; import {UIEventSource} from "./UI/UIEventSource"; +import {Changes} from "./Logic/Osm/Changes"; export class Helpers { diff --git a/InitUiElements.ts b/InitUiElements.ts index 7d20c4c..9eb596f 100644 --- a/InitUiElements.ts +++ b/InitUiElements.ts @@ -6,25 +6,30 @@ import {ShareScreen} from "./UI/ShareScreen"; import {FixedUiElement} from "./UI/Base/FixedUiElement"; import {CheckBox} from "./UI/Input/CheckBox"; import Combine from "./UI/Base/Combine"; -import {OsmConnection} from "./Logic/OsmConnection"; -import {Basemap} from "./Logic/Basemap"; import {UIEventSource} from "./UI/UIEventSource"; import {UIElement} from "./UI/UIElement"; import {MoreScreen} from "./UI/MoreScreen"; +import {Tag} from "./Logic/TagsFilter"; +import {FilteredLayer} from "./Logic/FilteredLayer"; +import {FeatureInfoBox} from "./UI/FeatureInfoBox"; +import {ElementStorage} from "./Logic/ElementStorage"; +import {Preset} from "./UI/SimpleAddUI"; +import {Changes} from "./Logic/Osm/Changes"; +import {OsmConnection} from "./Logic/Osm/OsmConnection"; +import {Basemap} from "./Logic/Leaflet/Basemap"; export class InitUiElements { - static OnlyIf(featureSwitch: UIEventSource
",
"",
Translations.W(layout.title),
"",
"
", Translations.W(layout.description), - "
",
- ""
- ]));
+ ]), {url: linkText, newTab: false});
els.push(link)
}
diff --git a/UI/PendingChanges.ts b/UI/PendingChanges.ts
index cda6214..384f7c7 100644
--- a/UI/PendingChanges.ts
+++ b/UI/PendingChanges.ts
@@ -1,6 +1,6 @@
import {UIElement} from "./UIElement";
import {UIEventSource} from "./UIEventSource";
-import {Changes} from "../Logic/Changes";
+import {Changes} from "../Logic/Osm/Changes";
export class PendingChanges extends UIElement {
private _pendingChangesCount: UIEventSource", Translations.W(layout.description), - "
" +
- highestQ.CreateHtml(this.source).Render() +
- "
";
- }
-
-}
\ No newline at end of file
diff --git a/UI/SearchAndGo.ts b/UI/SearchAndGo.ts
index 8e51f93..0e0a574 100644
--- a/UI/SearchAndGo.ts
+++ b/UI/SearchAndGo.ts
@@ -1,13 +1,13 @@
-import {UIElement} from "./UIElement";
-import {TextField} from "./Input/TextField";
-import {UIEventSource} from "./UIEventSource";
-import {FixedUiElement} from "./Base/FixedUiElement";
-import {Geocoding} from "../Logic/Geocoding";
-import {Basemap} from "../Logic/Basemap";
-import {VariableUiElement} from "./Base/VariableUIElement";
-import Translation from "./i18n/Translation";
import Locale from "./i18n/Locale";
+import {UIEventSource} from "./UIEventSource";
+import {UIElement} from "./UIElement";
+import Translation from "./i18n/Translation";
+import {VariableUiElement} from "./Base/VariableUIElement";
+import {FixedUiElement} from "./Base/FixedUiElement";
+import {TextField} from "./Input/TextField";
+import {Geocoding} from "../Logic/Osm/Geocoding";
import Translations from "./i18n/Translations";
+import {Basemap} from "../Logic/Leaflet/Basemap";
export class SearchAndGo extends UIElement {
diff --git a/UI/SimpleAddUI.ts b/UI/SimpleAddUI.ts
index 77ff1d7..ecb24af 100644
--- a/UI/SimpleAddUI.ts
+++ b/UI/SimpleAddUI.ts
@@ -2,12 +2,23 @@ import {UIElement} from "./UIElement";
import {UIEventSource} from "./UIEventSource";
import {Tag} from "../Logic/TagsFilter";
import {FilteredLayer} from "../Logic/FilteredLayer";
-import {Changes} from "../Logic/Changes";
import {FixedUiElement} from "./Base/FixedUiElement";
import {Button} from "./Base/Button";
-import {UserDetails} from "../Logic/OsmConnection";
import Translations from "./i18n/Translations";
import Combine from "./Base/Combine";
+import {SubtleButton} from "./Base/SubtleButton";
+import {VerticalCombine} from "./Base/VerticalCombine";
+import Locale from "./i18n/Locale";
+import {Changes} from "../Logic/Osm/Changes";
+import {UserDetails} from "../Logic/Osm/OsmConnection";
+
+export interface Preset {
+ description: string | UIElement,
+ name: string | UIElement,
+ icon: string,
+ tags: Tag[],
+ layerToAddTo: FilteredLayer
+}
/**
* Asks to add a feature at the last clicked location, at least if zoom is sufficient
@@ -17,19 +28,27 @@ export class SimpleAddUI extends UIElement {
private _addButtons: UIElement[];
private _lastClickLocation: UIEventSource<{ lat: number; lon: number }>;
private _changes: Changes;
- private _selectedElement: UIEventSource<{feature: any}>;
+ private _selectedElement: UIEventSource<{ feature: any }>;
private _dataIsLoading: UIEventSource