Merge branch 'develop' into tag_as_not

data/core.yaml

@@ -7,6 +7,7 @@ en:
     zoom_to: zoom to
     copy: copy
     view_on: view on {domain}
+    visit_website: visit website
     favorite: favorite
     list: list
     text: text
@@ -311,10 +312,11 @@ en:
         other: "Merged {n} features."
       not_eligible: These features can't be merged.
       not_adjacent: These features can't be merged because their endpoints aren't connected.
-      restriction: "These features can't be merged because it would damage a \"{relation}\" relation."
+      damage_relation: "These features can't be merged because it would damage a \"{relation}\" relation."
       relation: These features can't be merged because they have conflicting relation roles.
       incomplete_relation: These features can't be merged because at least one hasn't been fully downloaded.
       conflicting_tags: These features can't be merged because some of their tags have conflicting values.
+      conflicting_relations: These features can't be merged because they belong to conflicting relations.
       paths_intersect: These features can't be merged because the resulting path would intersect itself.
       too_many_vertices: These features can't be merged because the resulting path would have too many points.
     move:

data/manual_imagery.json

@@ -1,7 +1,7 @@
 [
  {
   "id": "Maxar-Premium",
-  "name": "Maxar Premium Imagery (Beta)",
+  "name": "Maxar Premium Imagery",
   "type": "tms",
   "default": true,
   "attribution": {
@@ -14,21 +14,5 @@
   "max_zoom": 22,
   "url": "7586487389962e3f6e31ab2ed8ca321f2f3fe2cf87f1dedce8fc918b4692efd86fcd816ab8a35303effb1be9abe39b1cce3fe6db2c740044364ae68560822c88373d2c784325baf4e1fa007c6dbedab4cea3fa0dd86ee0ae4feeef032d33dcac28e4b16c90d55a42087c6b66526423ea1b4cc7e63c613940eb1c60f48270060bf41c5fcb6a628985ebe6801e9e71f015cf9dd7a76f004360017065667dc1cfe028f1332689e2d001bd06d4ebf019f829f3aac2",
   "encrypted": true
- },
- {
-  "id": "Maxar-Standard",
-  "name": "Maxar Standard Imagery (Beta)",
-  "type": "tms",
-  "default": true,
-  "attribution": {
-   "required": true,
-   "text": "Terms & Feedback",
-   "url": "https://wiki.openstreetmap.org/wiki/DigitalGlobe"
-  },
-  "description": "Maxar Standard is a curated set of imagery covering 86% of the earth’s landmass, with 30-60cm resolution where available, backfilled by Landsat. Average age is 2.31 years, with some areas updated 2x per year.",
-  "icon": "https://osmlab.github.io/editor-layer-index/sources/world/Maxar.png",
-  "max_zoom": 22,
-  "url": "7586487389962e3f6e31ab2ed8ca321f2f3fe2cf87f1dedce8fc918b4692efd86fcd816ab8a35303effb1be9abe39b1cce3fe6db2c740044364ae68560822c88373d2c784325baf4e1fa007c6dbedab4cea3fa0dd86ee0ae4feeef032d33dcac28e4b16c90d55a42087c6b66526423ea1b4cc7e63c613940eb1c60f48270060bf41c5fcb6a628985ebe6801e9e71f010c8c9d7fb6b534560012461377dc1cdb672f16827dfe0d005bf5685b7ac4ea97cf5f795",
-  "encrypted": true
  }
 ]