diff --git a/Customizations/AllKnownLayouts.ts b/Customizations/AllKnownLayouts.ts index b5165c4..678edea 100644 --- a/Customizations/AllKnownLayouts.ts +++ b/Customizations/AllKnownLayouts.ts @@ -17,7 +17,6 @@ export class AllKnownLayouts { public static allSets = AllKnownLayouts.AllLayouts(); private static AllLayouts(): Map { - const all = new All(); const layouts: Layout[] = [ new Groen(), new GRB(), @@ -27,15 +26,26 @@ export class AllKnownLayouts { new MetaMap(), new StreetWidth(), new Natuurpunt(), - all /*new Toilets(), new Statues(), */ ]; + + + const all = new All(); + for (const layout of layouts) { + for (const layer of layout.layers) { + if (all.layers.indexOf(layer) >= 0) { + continue; + } + all.layers.push(layer); + } + } + layouts.push(all) + const allSets: Map = new Map(); for (const layout of layouts) { allSets[layout.name] = layout; - all.layers = all.layers.concat(layout.layers); } return allSets; } diff --git a/Customizations/OnlyShowIf.ts b/Customizations/OnlyShowIf.ts index 4d629f0..ac040bd 100644 --- a/Customizations/OnlyShowIf.ts +++ b/Customizations/OnlyShowIf.ts @@ -64,7 +64,7 @@ class OnlyShowIf extends UIElement implements TagDependantUIElement { return this._filter.matches(TagUtils.proprtiesToKV(this._source.data)); } - protected InnerRender(): string { + InnerRender(): string { if (this.Matches()) { return this._embedded.Render(); } else { @@ -82,6 +82,13 @@ class OnlyShowIf extends UIElement implements TagDependantUIElement { } return this._embedded.IsKnown(); } + + IsSkipped(): boolean { + if(!this.Matches()){ + return false; + } + return this._embedded.IsSkipped(); + } IsQuestioning(): boolean { if(!this.Matches()){ diff --git a/Customizations/TagRendering.ts b/Customizations/TagRendering.ts index ef41c2d..73798d0 100644 --- a/Customizations/TagRendering.ts +++ b/Customizations/TagRendering.ts @@ -15,7 +15,6 @@ import {FixedInputElement} from "../UI/Input/FixedInputElement"; import {RadioButton} from "../UI/Input/RadioButton"; import Translations from "../UI/i18n/Translations"; import Locale from "../UI/i18n/Locale"; -import {FloatField, IntField, StringField} from "../UI/Input/PhoneField"; export class TagRenderingOptions implements TagDependantUIElementConstructor { @@ -402,6 +401,10 @@ class TagRendering extends UIElement implements TagDependantUIElement { return this._freeform !== undefined && this._source.data[this._freeform.key] !== undefined; } + IsSkipped(): boolean { + return this._questionSkipped.data; + } + private CurrentValue(): TagsFilter { const tags = TagUtils.proprtiesToKV(this._source.data); diff --git a/Customizations/UIElementConstructor.ts b/Customizations/UIElementConstructor.ts index 61f16ae..c87dec7 100644 --- a/Customizations/UIElementConstructor.ts +++ b/Customizations/UIElementConstructor.ts @@ -19,4 +19,5 @@ export abstract class TagDependantUIElement extends UIElement { abstract Priority() : number; + abstract IsSkipped() : boolean; } \ No newline at end of file diff --git a/UI/ConfirmDialog.ts b/UI/ConfirmDialog.ts index 8395401..a4159f4 100644 --- a/UI/ConfirmDialog.ts +++ b/UI/ConfirmDialog.ts @@ -49,7 +49,7 @@ export class ConfirmDialog extends UIElement { } - protected InnerRender(): string { + InnerRender(): string { if (!this._source.data) { return ""; } diff --git a/UI/FeatureInfoBox.ts b/UI/FeatureInfoBox.ts index c9477ef..3fb0f4d 100644 --- a/UI/FeatureInfoBox.ts +++ b/UI/FeatureInfoBox.ts @@ -104,7 +104,7 @@ export class FeatureInfoBox extends UIElement { info.push(infobox); } else if (infobox.IsQuestioning()) { questions.push(infobox); - } else { + } else if(infobox.IsSkipped()){ // This question is neither known nor questioning -> it was skipped skippedQuestions++; } diff --git a/UI/Image/ImageCarousel.ts b/UI/Image/ImageCarousel.ts index b3f40d8..86c7ccf 100644 --- a/UI/Image/ImageCarousel.ts +++ b/UI/Image/ImageCarousel.ts @@ -126,6 +126,10 @@ export class ImageCarousel extends TagDependantUIElement { IsQuestioning(): boolean { return false; } + + IsSkipped(): boolean { + return false; + } Priority(): number { return 0; diff --git a/UI/Image/ImageCarouselWithUpload.ts b/UI/Image/ImageCarouselWithUpload.ts index 8ce0225..a4a8f1a 100644 --- a/UI/Image/ImageCarouselWithUpload.ts +++ b/UI/Image/ImageCarouselWithUpload.ts @@ -65,6 +65,10 @@ class ImageCarouselWithUpload extends TagDependantUIElement { IsQuestioning(): boolean { return false; } + + IsSkipped(): boolean { + return false; + } Priority(): number { return 0; diff --git a/assets/logos/logo.svg b/assets/logos/logo.svg new file mode 100644 index 0000000..7e4cba1 --- /dev/null +++ b/assets/logos/logo.svg @@ -0,0 +1,3300 @@ + + + + + OpenStreetMap logo 2011 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + OpenStreetMap logo 2011 + + + Ken Vermette + + + + April 2011 + + + OpenStreetMap.org + + + Replacement logo for OpenStreetMap Foundation + + + OSM openstreetmap logo + + + http://wiki.openstreetmap.org/wiki/File:Public-images-osm_logo.svg + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 010110010011010110010011  + 010110010011010110010011  + + + diff --git a/assets/logos/logo192.png b/assets/logos/logo192.png new file mode 100644 index 0000000..0b71451 Binary files /dev/null and b/assets/logos/logo192.png differ diff --git a/assets/logos/logo512.png b/assets/logos/logo512.png new file mode 100644 index 0000000..9c9015d Binary files /dev/null and b/assets/logos/logo512.png differ diff --git a/index.css b/index.css index ed506c0..0d7dc23 100644 --- a/index.css +++ b/index.css @@ -216,7 +216,8 @@ form { } #topleft-tools { - margin: 0.5em; + margin: 0.2em !important; + margin-top: 0.3em !important;; } #userbadge { diff --git a/index.html b/index.html index 4b0ebaf..79036ba 100644 --- a/index.html +++ b/index.html @@ -9,6 +9,7 @@ integrity="sha512-xwE/Az9zrjBIphAcBb3F6JVqxf46+CDLwfLMHloNu6KEQCAWi6HcDUbeOfBIptF7tcCzusKFjFw2yuvEpDL9wQ==" crossorigin=""/> +