UX: map in 'add new point' now takes the full screen

Docs/UserTests/2023-10-17 User Test Studio bxl-forever.md

@@ -21,3 +21,5 @@ The participant has extensive OpenStreetMap-knowledge but only used MapComplete
 - [x] This user had an expression with two tags in an AND. There was some confusion if the taginfo-count gave the totals for the tags individually or for the entire expression.
         Fix: play with padding and wording
 - [x] BUG: having a complex expression for tags (e.g. with `and: [key=value, key0=value0]`) fails as the JSON would be stringified
+- [x] In MapComplete (not in studio): creating a new point: the buttons might dissapear under scroll if zoomed in a lot
+- [x] If a layer does not have a title and a tagRenderings, it is not interpreted as 'standalone' theme

assets/layers/last_click/last_click.json

@@ -156,6 +156,7 @@
   "tagRenderings": [
     {
       "id": "add_new",
+      "classes": "h-full flex",
       "condition": "has_presets=yes",
       "render": {
         "*": "{add_new_point()}"

src/Models/ThemeConfig/Conversion/PrepareLayer.ts

@@ -483,6 +483,9 @@ export class AddQuestionBox extends DesugaringStep<LayerConfigJson> {
         ) {
             return json
         }
+        if (json.source === "special") {
+            return json
+        }
         json = { ...json }
         json.tagRenderings = [...json.tagRenderings]
         const allSpecials: Exclude<RenderingSpecification, string>[] = <any>(

src/UI/BigComponents/SelectedElementView.svelte

@@ -28,10 +28,11 @@
     <Tr t={Translations.t.general.returnToTheMap} />
   </button>
 {:else}
-  <div class="flex flex-col gap-y-2 overflow-y-auto p-1 px-2">
+  <div class="flex flex-col gap-y-2 overflow-y-auto p-1 px-2 h-full">
     {#each layer.tagRenderings as config (config.id)}
       {#if (config.condition?.matchesProperties($tags) ?? true) && config.metacondition?.matchesProperties({ ...$tags, ..._metatags } ?? true)}
         {#if config.IsKnown($tags)}
+          {config.id}
           <TagRenderingEditable
             {tags}
             {config}

src/UI/Popup/AddNewPoint/AddNewPoint.svelte

@@ -3,109 +3,109 @@
    * This component ties together all the steps that are needed to create a new point.
    * There are many subcomponents which help with that
    */
-  import type { SpecialVisualizationState } from "../../SpecialVisualization"
+  import type { SpecialVisualizationState } from "../../SpecialVisualization";
-  import PresetList from "./PresetList.svelte"
+  import PresetList from "./PresetList.svelte";
-  import type PresetConfig from "../../../Models/ThemeConfig/PresetConfig"
+  import type PresetConfig from "../../../Models/ThemeConfig/PresetConfig";
-  import LayerConfig from "../../../Models/ThemeConfig/LayerConfig"
+  import LayerConfig from "../../../Models/ThemeConfig/LayerConfig";
-  import Tr from "../../Base/Tr.svelte"
+  import Tr from "../../Base/Tr.svelte";
-  import SubtleButton from "../../Base/SubtleButton.svelte"
+  import SubtleButton from "../../Base/SubtleButton.svelte";
-  import FromHtml from "../../Base/FromHtml.svelte"
+  import FromHtml from "../../Base/FromHtml.svelte";
-  import Translations from "../../i18n/Translations.js"
+  import Translations from "../../i18n/Translations.js";
-  import TagHint from "../TagHint.svelte"
+  import TagHint from "../TagHint.svelte";
-  import { And } from "../../../Logic/Tags/And.js"
+  import { And } from "../../../Logic/Tags/And.js";
-  import LoginToggle from "../../Base/LoginToggle.svelte"
+  import LoginToggle from "../../Base/LoginToggle.svelte";
-  import Constants from "../../../Models/Constants.js"
+  import Constants from "../../../Models/Constants.js";
-  import FilteredLayer from "../../../Models/FilteredLayer"
+  import FilteredLayer from "../../../Models/FilteredLayer";
-  import { Store, UIEventSource } from "../../../Logic/UIEventSource"
+  import { Store, UIEventSource } from "../../../Logic/UIEventSource";
-  import { EyeIcon, EyeOffIcon } from "@rgossiaux/svelte-heroicons/solid"
+  import { EyeIcon, EyeOffIcon } from "@rgossiaux/svelte-heroicons/solid";
-  import LoginButton from "../../Base/LoginButton.svelte"
+  import LoginButton from "../../Base/LoginButton.svelte";
-  import NewPointLocationInput from "../../BigComponents/NewPointLocationInput.svelte"
+  import NewPointLocationInput from "../../BigComponents/NewPointLocationInput.svelte";
-  import CreateNewNodeAction from "../../../Logic/Osm/Actions/CreateNewNodeAction"
+  import CreateNewNodeAction from "../../../Logic/Osm/Actions/CreateNewNodeAction";
-  import { OsmWay } from "../../../Logic/Osm/OsmObject"
+  import { OsmWay } from "../../../Logic/Osm/OsmObject";
-  import { Tag } from "../../../Logic/Tags/Tag"
+  import { Tag } from "../../../Logic/Tags/Tag";
-  import type { WayId } from "../../../Models/OsmFeature"
+  import type { WayId } from "../../../Models/OsmFeature";
-  import Loading from "../../Base/Loading.svelte"
+  import Loading from "../../Base/Loading.svelte";
-  import type { GlobalFilter } from "../../../Models/GlobalFilter"
+  import type { GlobalFilter } from "../../../Models/GlobalFilter";
-  import { onDestroy } from "svelte"
+  import { onDestroy } from "svelte";
-  import NextButton from "../../Base/NextButton.svelte"
+  import NextButton from "../../Base/NextButton.svelte";
-  import BackButton from "../../Base/BackButton.svelte"
+  import BackButton from "../../Base/BackButton.svelte";
-  import ToSvelte from "../../Base/ToSvelte.svelte"
+  import ToSvelte from "../../Base/ToSvelte.svelte";
-  import Svg from "../../../Svg"
+  import Svg from "../../../Svg";
-  import OpenBackgroundSelectorButton from "../../BigComponents/OpenBackgroundSelectorButton.svelte"
+  import OpenBackgroundSelectorButton from "../../BigComponents/OpenBackgroundSelectorButton.svelte";
-  import { twJoin } from "tailwind-merge"
+  import { twJoin } from "tailwind-merge";
 
-  export let coordinate: { lon: number; lat: number }
+  export let coordinate: { lon: number; lat: number };
-  export let state: SpecialVisualizationState
+  export let state: SpecialVisualizationState;
 
   let selectedPreset: {
     preset: PresetConfig
     layer: LayerConfig
     icon: string
     tags: Record<string, string>
-  } = undefined
+  } = undefined;
-  let checkedOfGlobalFilters: number = 0
+  let checkedOfGlobalFilters: number = 0;
-  let confirmedCategory = false
+  let confirmedCategory = false;
   $: if (selectedPreset === undefined) {
-    confirmedCategory = false
+    confirmedCategory = false;
-    creating = false
+    creating = false;
-    checkedOfGlobalFilters = 0
+    checkedOfGlobalFilters = 0;
   }
 
-  let flayer: FilteredLayer = undefined
+  let flayer: FilteredLayer = undefined;
-  let layerIsDisplayed: UIEventSource<boolean> | undefined = undefined
+  let layerIsDisplayed: UIEventSource<boolean> | undefined = undefined;
-  let layerHasFilters: Store<boolean> | undefined = undefined
+  let layerHasFilters: Store<boolean> | undefined = undefined;
-  let globalFilter: UIEventSource<GlobalFilter[]> = state.layerState.globalFilters
+  let globalFilter: UIEventSource<GlobalFilter[]> = state.layerState.globalFilters;
-  let _globalFilter: GlobalFilter[] = []
+  let _globalFilter: GlobalFilter[] = [];
   onDestroy(
     globalFilter.addCallbackAndRun((globalFilter) => {
-      console.log("Global filters are", globalFilter)
+      console.log("Global filters are", globalFilter);
-      _globalFilter = globalFilter ?? []
+      _globalFilter = globalFilter ?? [];
     })
-  )
+  );
   $: {
-    flayer = state.layerState.filteredLayers.get(selectedPreset?.layer?.id)
+    flayer = state.layerState.filteredLayers.get(selectedPreset?.layer?.id);
-    layerIsDisplayed = flayer?.isDisplayed
+    layerIsDisplayed = flayer?.isDisplayed;
-    layerHasFilters = flayer?.hasFilter
+    layerHasFilters = flayer?.hasFilter;
   }
-  const t = Translations.t.general.add
+  const t = Translations.t.general.add;
 
-  const zoom = state.mapProperties.zoom
+  const zoom = state.mapProperties.zoom;
 
-  const isLoading = state.dataIsLoading
+  const isLoading = state.dataIsLoading;
-  let preciseCoordinate: UIEventSource<{ lon: number; lat: number }> = new UIEventSource(undefined)
+  let preciseCoordinate: UIEventSource<{ lon: number; lat: number }> = new UIEventSource(undefined);
-  let snappedToObject: UIEventSource<string> = new UIEventSource<string>(undefined)
+  let snappedToObject: UIEventSource<string> = new UIEventSource<string>(undefined);
 
   // Small helper variable: if the map is tapped, we should let the 'Next'-button grab some attention as users have to click _that_ to continue, not the map
-  let preciseInputIsTapped = false
+  let preciseInputIsTapped = false;
 
-  let creating = false
+  let creating = false;
 
   /**
    * Call when the user should restart the flow by clicking on the map, e.g. because they disabled filters.
    * Will delete the lastclick-location
    */
   function abort() {
-    state.selectedElement.setData(undefined)
+    state.selectedElement.setData(undefined);
     // When aborted, we force the contributors to place the pin _again_
     // This is because there might be a nearby object that was disabled; this forces them to re-evaluate the map
-    state.lastClickObject.features.setData([])
+    state.lastClickObject.features.setData([]);
-    preciseInputIsTapped = false
+    preciseInputIsTapped = false;
   }
 
   async function confirm() {
-    creating = true
+    creating = true;
-    const location: { lon: number; lat: number } = preciseCoordinate.data
+    const location: { lon: number; lat: number } = preciseCoordinate.data;
-    const snapTo: WayId | undefined = <WayId>snappedToObject.data
+    const snapTo: WayId | undefined = <WayId>snappedToObject.data;
     const tags: Tag[] = selectedPreset.preset.tags.concat(
       ..._globalFilter.map((f) => f?.onNewPoint?.tags ?? [])
-    )
+    );
-    console.log("Creating new point at", location, "snapped to", snapTo, "with tags", tags)
+    console.log("Creating new point at", location, "snapped to", snapTo, "with tags", tags);
 
-    let snapToWay: undefined | OsmWay = undefined
+    let snapToWay: undefined | OsmWay = undefined;
     if (snapTo !== undefined && snapTo !== null) {
-      const downloaded = await state.osmObjectDownloader.DownloadObjectAsync(snapTo, 0)
+      const downloaded = await state.osmObjectDownloader.DownloadObjectAsync(snapTo, 0);
       if (downloaded !== "deleted") {
-        snapToWay = downloaded
+        snapToWay = downloaded;
       }
     }
 
@@ -113,44 +113,44 @@
       theme: state.layout?.id ?? "unkown",
       changeType: "create",
       snapOnto: snapToWay,
-      reusePointWithinMeters: 1,
+      reusePointWithinMeters: 1
-    })
+    });
-    await state.changes.applyAction(newElementAction)
+    await state.changes.applyAction(newElementAction);
-    state.newFeatures.features.ping()
+    state.newFeatures.features.ping();
     // The 'changes' should have created a new point, which added this into the 'featureProperties'
-    const newId = newElementAction.newElementId
+    const newId = newElementAction.newElementId;
-    console.log("Applied pending changes, fetching store for", newId)
+    console.log("Applied pending changes, fetching store for", newId);
-    const tagsStore = state.featureProperties.getStore(newId)
+    const tagsStore = state.featureProperties.getStore(newId);
     if (!tagsStore) {
-      console.error("Bug: no tagsStore found for", newId)
+      console.error("Bug: no tagsStore found for", newId);
     }
     {
       // Set some metainfo
-      const properties = tagsStore.data
+      const properties = tagsStore.data;
       if (snapTo) {
         // metatags (starting with underscore) are not uploaded, so we can safely mark this
-        delete properties["_referencing_ways"]
+        delete properties["_referencing_ways"];
-        properties["_referencing_ways"] = `["${snapTo}"]`
+        properties["_referencing_ways"] = `["${snapTo}"]`;
       }
-      properties["_backend"] = state.osmConnection.Backend()
+      properties["_backend"] = state.osmConnection.Backend();
-      properties["_last_edit:timestamp"] = new Date().toISOString()
+      properties["_last_edit:timestamp"] = new Date().toISOString();
-      const userdetails = state.osmConnection.userDetails.data
+      const userdetails = state.osmConnection.userDetails.data;
-      properties["_last_edit:contributor"] = userdetails.name
+      properties["_last_edit:contributor"] = userdetails.name;
-      properties["_last_edit:uid"] = "" + userdetails.uid
+      properties["_last_edit:uid"] = "" + userdetails.uid;
-      tagsStore.ping()
+      tagsStore.ping();
     }
-    const feature = state.indexedFeatures.featuresById.data.get(newId)
+    const feature = state.indexedFeatures.featuresById.data.get(newId);
-    console.log("Selecting feature", feature, "and opening their popup")
+    console.log("Selecting feature", feature, "and opening their popup");
-    abort()
+    abort();
-    state.selectedLayer.setData(selectedPreset.layer)
+    state.selectedLayer.setData(selectedPreset.layer);
-    state.selectedElement.setData(feature)
+    state.selectedElement.setData(feature);
-    tagsStore.ping()
+    tagsStore.ping();
   }
 
   function confirmSync() {
     confirm()
       .then((_) => console.debug("New point successfully handled"))
-      .catch((e) => console.error("Handling the new point went wrong due to", e))
+      .catch((e) => console.error("Handling the new point went wrong due to", e));
   }
 </script>
 
@@ -162,6 +162,8 @@
   <LoginButton osmConnection={state.osmConnection} slot="not-logged-in">
     <Tr slot="message" t={Translations.t.general.add.pleaseLogin} />
   </LoginButton>
+  <div class="h-full w-full">
+
     {#if $zoom < Constants.minZoomLevelToAddNewPoint}
       <div class="alert">
         <Tr t={Translations.t.general.add.zoomInFurther} />
@@ -318,8 +320,9 @@
         <Tr slot="message" t={Translations.t.general.cancel} />
       </SubtleButton>
     {:else if !creating}
-    <div class="relative w-full p-1">
+      <div class="flex flex-col h-full">
-      <div class="h-96 max-h-screen w-full overflow-hidden rounded-xl">
+        <div class="relative min-h-20 h-full w-full p-1 ">
+          <div class="h-full w-full overflow-hidden rounded-xl">
             <NewPointLocationInput
               on:click={() => {
             preciseInputIsTapped = true
@@ -339,6 +342,7 @@
           "absolute top-0 flex w-full justify-center p-12"
         )}
           >
+            <!-- This is an _extra_ button that appears when the map is tapped - see usertest 2023-01-07 -->
             <NextButton on:click={confirmSync} clss="primary w-fit">
               <div class="flex w-full justify-end gap-x-2">
                 <Tr t={Translations.t.general.add.confirmLocation} />
@@ -361,7 +365,9 @@
             </div>
           </NextButton>
         </div>
+      </div>
     {:else}
       <Loading>Creating point...</Loading>
     {/if}
+  </div>
 </LoginToggle>

src/UI/Popup/TagRendering/Questionbox.svelte

@@ -95,7 +95,7 @@
   }
 </script>
 
-<div bind:this={questionboxElem}>
+<div bind:this={questionboxElem} class="marker-questionbox-root" class:hidden={_questionsToAsk.length === 0 && skipped === 0 && answered === 0}>
   {#if _questionsToAsk.length === 0}
     {#if skipped + answered > 0}
       <div class="thanks">

src/UI/Popup/TagRendering/TagRenderingEditable.svelte

@@ -20,6 +20,8 @@
 
   export let editingEnabled: Store<boolean> | undefined = state?.featureSwitchUserbadge;
   
+  export let clss = config.classes.join(" ")
+  
   export let highlightedRendering: UIEventSource<string> = undefined;
   export let showQuestionIfUnknown: boolean = false;
   /**
@@ -71,7 +73,7 @@
   }
 </script>
 
-<div bind:this={htmlElem} class="">
+<div bind:this={htmlElem} class={clss}>
   {#if config.question && (!editingEnabled || $editingEnabled)}
     {#if editMode}
       <TagRenderingQuestion {config} {tags} {selectedElement} {state} {layer}>
@@ -106,7 +108,7 @@
       </div>
     {/if}
   {:else}
-    <div class="overflow-hidden p-2">
+    <div class="overflow-hidden p-2 w-full">
       <TagRenderingAnswer {config} {tags} {selectedElement} {state} {layer} />
     </div>
   {/if}