Merge branch 'develop' into layer_scouting_groups

.forgejo/workflows/deploy_hosted.yml

@@ -62,5 +62,17 @@ jobs:
       - name: unzipping remote file
         run: ssh hetzner "cd /root/staging && rm -rf ${{ github.ref_name }} && unzip ${{ github.ref_name }}.zip && rm -rf /root/public/${{ github.ref_name }} && mv /root/staging/${{ github.ref_name }}/ /root/public/ && rm ${{ github.ref_name }}.zip"
 
+      - name: Extract PR number
+        run: echo "PR_NUMBER=$(echo $FORGEJO_REF_NAME | cut -d'/' -f3)" >> $FORGEJO_ENV
+
+      - name: add comment to PR
+        if: env.PR_NUMBER != ''
+        run: |
+          curl -X POST "https://source.mapcomplete.org/api/v1/repos/${FORGEJO_REPOSITORY}/issues/${PR_NUMBER}/comments" \
+          -H "Content-Type: application/json" \
+          -H "Authorization: token $FORGEJO_TOKEN" \
+          -d '{"body": "This PR has been deployed and is (temporarily) available on https://builds.mapcomplete.org/${PR_NUMBER}"}'
+        env:
+          FORGEJO_TOKEN: ${{ secrets.FORGEJO_TOKEN }}
           
 

assets/layers/icons/icons.json

@@ -18,7 +18,13 @@
         "defaults",
         "in_favourite"
       ],
-      "render": "<a href='https://wikipedia.org/wiki/{wikipedia}' target='_blank' rel='noopener'><img src='./assets/svg/wikipedia.svg' textmode='📖' alt='Wikipedia'/></a>",
+      "render": {
+        "special": {
+          "type": "link",
+          "href": "https://wikipedia.org/wiki/{wikipedia}",
+          "text": "<img src='./assets/svg/wikipedia.svg' textmode='📖' alt='Wikipedia'/>"
+        }
+      },
       "condition": {
         "or": [
           "wikipedia~*",
@@ -29,7 +35,14 @@
         {
           "#": "ignore-image-in-then",
           "if": "wikipedia=",
-          "then": "<a class='h-8' href='https://www.wikidata.org/wiki/{wikidata}' target='_blank' rel='noopener'><img src='./assets/svg/wikidata.svg' alt='Wikidata'/></a>"
+          "then": {
+            "special": {
+              "type": "link",
+              "class": "h-8",
+              "href": "https://www.wikidata.org/wiki/{wikidata}",
+              "text": "<img src='./assets/svg/wikidata.svg' alt='Wikidata'/></a>"
+            }
+          }
         }
       ]
     },

src/UI/Popup/AddNewPoint/AddNewPoint.svelte

@@ -78,7 +78,7 @@
 
   const isLoading = state.dataIsLoading
   let preciseCoordinate: UIEventSource<{ lon: number; lat: number }> = new UIEventSource(undefined)
-  let snappedToObject: UIEventSource<WayId> = new UIEventSource<string>(undefined)
+  let snappedToObject: UIEventSource<WayId> = new UIEventSource<WayId>(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
@@ -172,11 +172,13 @@
         <Tr t={Translations.t.general.add.zoomInFurther} />
       </div>
     {:else if $isLoading}
+      <div class="w-full h-full p-2 flex items-center justify-center">
       <div class="alert">
         <Loading>
           <Tr t={Translations.t.general.add.stillLoading} />
         </Loading>
       </div>
+      </div>
     {:else if selectedPreset === undefined}
       <!-- First, select the correct preset -->
       <PresetList
@@ -285,7 +287,6 @@
         {/if}
         <TagHint
           embedIn={(tags) => t.presetInfo.Subs({ tags })}
-          {state}
           tags={new And(selectedPreset.preset.tags)}
         />