Merge branch 'develop' into issue-8813

ARCHITECTURE.md

@@ -467,7 +467,7 @@ A feature's tags indicate it should have a different geometry than it currently
 * `point_as_vertex`: a vertex node has tags implying it should be detached from ways (e.g. `amenity=cafe`)
 * `vertex_as_area`
 * `vertex_as_line`
-* `vertex_as_point`: a detached node has tags implying it should be part of a way (e.g. `highway=stop`)
+* `vertex_as_point`: a detached node has tags implying it should be attached to a way (e.g. `highway=stop`)
 * `unclosed_multipolygon_part`: a relation is tagged as a multipolygon but not all of its member ways form closed rings
 
 ##### `missing_role`

CHANGELOG.md

@@ -53,6 +53,7 @@ _Breaking developer changes, which may affect downstream projects or sites that
 #### :bug: Bugfixes
 * Fix hidden tooltips on map control toolbar ([#8781])
 * Fix glitching out turn restriction minimap on narrow sidebars ([#8792])
+* Fix a bug which made it impossible to switch to a custom TMS imagery layer after using a custom WMS source and vice versa ([#8057])
 #### :earth_asia: Localization
 #### :hourglass: Performance
 #### :mortar_board: Walkthrough / Help
@@ -61,6 +62,7 @@ _Breaking developer changes, which may affect downstream projects or sites that
 * Add colours for preset categories ([#8799])
 #### :hammer: Development
 
+[#8057]: https://github.com/openstreetmap/iD/issues/8057
 [#8771]: https://github.com/openstreetmap/iD/issues/8771
 [#8781]: https://github.com/openstreetmap/iD/issues/8781
 [#8792]: https://github.com/openstreetmap/iD/pull/8792

data/core.yaml

@@ -563,7 +563,6 @@ en:
     tooltip: "Redo: {action}"
     nothing: Nothing to redo.
   tooltip_keyhint: "Shortcut:"
-  browser_notice: "This editor is supported in Firefox, Chrome, Safari, Opera, and Internet Explorer 11 and above. Please upgrade your browser or use Potlatch 2 to edit the map."
   translate:
     translate: Add multilingual name
     localized_translation_label: Multilingual Name
@@ -1886,7 +1885,7 @@ en:
       buildings:
         reference: "Buildings with unsquare corners can often be drawn more accurately."
     vertex_as_point:
-      message: '{feature} should be part of a line or area based on its tags'
+      message: '{feature} should be attached to a line or area based on its tags'
       reference: "Some features shouldn't be standalone points."
     fix:
       add_a_bridge:

modules/renderer/background_source.js

@@ -118,7 +118,7 @@ export function rendererBackgroundSource(data) {
 
         // Guess a type based on the tokens present in the template
         // (This is for 'custom' source, where we don't know)
-        if (!source.type) {
+        if (!source.type || source.id === 'custom') {
             if (/SERVICE=WMS|\{(proj|wkid|bbox)\}/.test(_template)) {
                 source.type = 'wms';
                 source.projection = 'EPSG:3857';  // guess