midgard/MapComplete
1
0
Fork 0
forked from MapComplete/MapComplete
Code Pull requests Activity

Move to popups again

Browse source
This commit is contained in:
Pieter Vander Vennet 2020-06-29 16:21:36 +02:00
parent 3e6def36b8
commit de9da2c220
11 changed files with 55 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

1
UI/FeatureInfoBox.ts
View file

@ -43,6 +43,7 @@ export class FeatureInfoBox extends UIElement {
this._tagsES = tagsES;
this._changes = changes;
this._userDetails = userDetails;
this.ListenTo(userDetails);
this._imageElement = new ImageCarousel(this._tagsES);

2
UI/ImageUploadFlow.ts
View file

@ -63,7 +63,7 @@ export class ImageUploadFlow extends UIElement {
protected InnerRender(): string {
if (!this._userdetails.data.loggedIn) {
return "<div class='activate-osm-authentication'>Gelieve je aan te melden om een foto toe te voegen</div>";
return "<div class='activate-osm-authentication'>Gelieve je aan te melden om een foto toe te voegen of vragen te beantwoorden</div>";
}
if (this._isUploading.data == 1) {
return "<b>Bezig met een foto te uploaden...</b>"

4
UI/MessageBoxHandler.ts
View file

@ -55,10 +55,10 @@ export class MessageBoxHandler {
}
location.hash = "#element"
wrapper.classList.remove("hidden");
gen()
/* gen()
?.HideOnEmpty(true)
?.AttachTo("messagesbox")
?.Activate();
?.Activate();*/
gen()
?.HideOnEmpty(true)

14
UI/SimpleAddUI.ts
View file

@ -5,6 +5,7 @@ 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";
/**
* Asks to add a feature at the last clicked location, at least if zoom is sufficient
@ -16,12 +17,14 @@ export class SimpleAddUI extends UIElement {
private _changes: Changes;
private _selectedElement: UIEventSource<any>;
private _dataIsLoading: UIEventSource<boolean>;
private _userDetails: UIEventSource<UserDetails>;
constructor(zoomlevel: UIEventSource<{ zoom: number }>,
lastClickLocation: UIEventSource<{ lat: number, lon: number }>,
changes: Changes,
selectedElement: UIEventSource<any>,
dataIsLoading: UIEventSource<boolean>,
userDetails: UIEventSource<UserDetails>,
addButtons: { name: string; icon: string; tags: Tag[]; layerToAddTo: FilteredLayer }[],
) {
super(zoomlevel);
@ -30,6 +33,8 @@ export class SimpleAddUI extends UIElement {
this._changes = changes;
this._selectedElement = selectedElement;
this._dataIsLoading = dataIsLoading;
this._userDetails = userDetails;
this.ListenTo(userDetails);
this._addButtons = [];
for (const option of addButtons) {
@ -60,11 +65,15 @@ export class SimpleAddUI extends UIElement {
if (this._zoomlevel.data.zoom < 19) {
return header + "Zoom verder in om een element toe te voegen.";
}
if(this._dataIsLoading.data){
if (this._dataIsLoading.data) {
return header + "De data is nog aan het laden. Nog even geduld, dan kan je een punt toevoegen";
}
if (!this._userDetails.data.loggedIn) {
return header + "<a class='activate-osm-authentication'>Gelieve je aan te melden om een nieuw punt toe te voegen</a>"
}
var html = "";
for (const button of this._addButtons) {
html += button.Render();
@ -77,6 +86,7 @@ export class SimpleAddUI extends UIElement {
for (const button of this._addButtons) {
button.Update();
}
this._userDetails.data.osmConnection.registerActivateOsmAUthenticationClass();
}
}