Merge branch 'develop' of github.com:pietervdvn/MapComplete into develop

assets/themes/uk_addresses/license_info.json

@@ -1,34 +1,4 @@
 [
-  {
-    "path": "Commemorative_plaque_on_Elizabeth_House_-_geograph.org.uk_-_2693028.jpg",
-    "license": "CC-BY-SA 2.0 Unported",
-    "authors": [
-      "Basher Eyre"
-    ],
-    "sources": [
-      "https://commons.wikimedia.org/wiki/File:Commemorative_plaque_on_Elizabeth_House_-_geograph.org.uk_-_2693028.jpg"
-    ]
-  },
-  {
-    "path": "Plaque,_Raphoe_House_-_geograph.org.uk_-_1925685.jpg",
-    "license": "CC-BY-SA 2.0",
-    "authors": [
-      "Kenneth Allen"
-    ],
-    "sources": [
-      "https://commons.wikimedia.org/wiki/File:Plaque,_Raphoe_House_-_geograph.org.uk_-_1925685.jpg"
-    ]
-  },
-  {
-    "path": "Plaque,_Séamus_Roddy_House_-_geograph.org.uk_-_2000318.jpg",
-    "license": "CC-BY-SA 2.0 Unported",
-    "authors": [
-      "Kenneth Allen"
-    ],
-    "sources": [
-      "https://commons.wikimedia.org/wiki/File:Plaque,_S%C3%A9amus_Roddy_House_-_geograph.org.uk_-_2000318.jpg"
-    ]
-  },
   {
     "path": "housenumber_add.svg",
     "license": "CC0",
@@ -79,13 +49,11 @@
     "sources": []
   },
   {
-    "path": "stamp.jpg",
-    "license": "CC-BY 2.0",
+    "path": "stamp-outline.png",
+    "license": "CC0",
     "authors": [
-      "Mark Morgan"
+      "Rob Nickerson"
     ],
-    "sources": [
-      "https://commons.wikimedia.org/wiki/File:Queen_Elizabeth_II_Virgin_Islands_stamp.jpg"
-    ]
+    "sources": []
   }
-]
+]

assets/themes/uk_addresses/uk_addresses.json

@@ -1,7 +1,7 @@
 {
   "id": "uk_addresses",
   "title": {
-    "en": "UK Addresses",
+    "en": "Addresses in Great Britain",
     "de": "Adressen in Großbritannien",
     "it": "Indirizzi UK",
     "id": "Alamat Inggris"
@@ -10,16 +10,12 @@
     "en"
   ],
   "shortDescription": {
-    "en": "Help to build an open dataset of UK addresses",
+    "en": "Help to build an open dataset of addresses in Great Britain",
     "de": "Helfen Sie beim Aufbau eines offenen Datensatzes britischer Adressen",
     "it": "Aiuta a costruire un dataset libero per gli indirizzi nel Regno Unito"
   },
   "description": {
-    "en": "Contribute to OpenStreetMap by filling out address information",
-    "nl": "Draag bij aan OpenStreetMap door adresinformatie in te vullen",
-    "de": "Tragen Sie zu OpenStreetMap bei, indem Sie Adressinformationen ausfüllen",
-    "it": "Contribuisci a OpenStreetMap inserendo le informazioni sull’indirizzo",
-    "id": "Berkontribusi untuk OpenStreetMap dengan mengisi informasi alamat"
+    "en": "Help us collect addresses and make them freely available. Each address contributed will be added to OpenStreetMap so you will need to create an account and log in before you start. Please do not copy addresses from the internet or other sources subject to copyright. This website works well on mobile so a good option is to contibute the addresses closest to you."
   },
   "maintainer": "Pieter Vander Vennet, Rob Nickerson, Russ Garrett",
   "icon": "./assets/themes/uk_addresses/housenumber_unknown.svg",
@@ -86,7 +82,7 @@
         "geoJson": "https://osm-uk-addresses.russss.dev/addresses/{z}/{x}/{y}.json",
         "osmTags": {
           "and": [
-            "ref:GB:inspire~*",
+            "urpn_count~*",
             "id!~node/.*"
           ]
         },
@@ -97,31 +93,30 @@
       "minzoom": 14,
       "title": {
         "render": {
-          "en": "Address to be determined",
-          "id": "Alamat yang diketahui"
+          "en": "This address needs adding"
         }
       },
       "tagRenderings": [
         {
           "id": "uk_addresses_explanation",
           "render": {
-            "en": "There probably is an address here"
+            "en": "We think there should be an address here. Please click below to add it."
           }
         },
         {
           "id": "uk_addresses_embedding_outline",
-          "render": "An outline embedding this point with an address already exists in OpenStreetMap.<br>This <a href='https://openstreetmap.org/{_embedding_object:id}' target='blank'>object</a> has address <b>{_embedding_object:addr:street} {_embedding_object:addr:housenumber}</b>",
+          "render": "<b>Warning: </b>This point lies within a building or area for which we already have an address. You should only add this address if it is different. <br>The number and street name we have for the <a href='#{_embedding_object:id}' target='blank'>existing address</a> is <b>{_embedding_object:addr:housenumber} {_embedding_object:addr:street}</b>",
           "mappings": [
             {
               "if": "_embedding_object:id=true",
               "then": {
-                "en": "The INSPIRE-polygon containing this point has at least one address contained"
+                "en": "<b>Warning: </b>The property boundary containing this point already contains at least one recorded address. You should only add this address if it is different."
               }
             },
             {
               "if": "_embedding_object:id=false",
               "then": {
-                "en": "The INSPIRE-polygon containing this point has <b>no</b> addresses contained"
+                "en": "We checked our data and found no other address within the same property boundary. If you know the details for this address, please add it."
               }
             }
           ],
@@ -129,7 +124,7 @@
         },
         {
           "id": "uk_addresses_import_button",
-          "render": "{import_button(address,ref:GB:inspire=$ref:GB:inspire;ref:GB:uprn=$ref:GB:uprn$, Add this address, ./assets/themes/uk_addresses/housenumber_add.svg)}"
+          "render": "{import_button(address,urpn_count=$urpn_count;ref:GB:uprn=$ref:GB:uprn$, Add this address, ./assets/themes/uk_addresses/housenumber_add.svg)}"
         }
       ],
       "calculatedTags": [
@@ -194,28 +189,31 @@
     {
       "id": "address",
       "name": {
-        "en": "Known addresses in OSM",
-        "de": "Bekannte Adressen in OSM",
-        "zh_Hant": "OSM 上已知的地址",
-        "hu": "Ismert címek az OSM-en",
-        "nl": "Bekende adressen in OSM"
+        "en": "Known addresses in OSM"
       },
       "minzoom": 18,
       "source": {
         "osmTags": {
           "or": [
+            "addr:unit~*",
+            "addr:flats~*",
+            "addr:housename~*",
             "addr:housenumber~*",
+            "addr:place~*",
+            "addr:substreet~*",
             "addr:street~*",
-            "ref:GB:inspire~*"
+            "addr:parentstreet~*",
+            "addr:suburb~*",
+            "addr:city~*",
+            "addr:postcode~*",
+            "fixme:addr~*",
+            "urpn_count~*"
           ]
         }
       },
       "title": {
         "render": {
-          "en": "Known address",
-          "de": "Bekannte Adresse",
-          "hu": "Ismert cím",
-          "nl": "Bekend adres"
+          "en": "Review and update the address"
         }
       },
       "description": {
@@ -233,23 +231,95 @@
         "_closest_street:2:name=JSON.parse(feat.properties._closest_3_street_names)[2]"
       ],
       "tagRenderings": [
+        "questions",
         {
-          "id": "uk_addresses_explanation_osm",
+          "id": "preview",
           "render": {
-            "en": "This address is saved in OpenStreetMap",
-            "de": "Diese Adresse ist in OpenStreetMap gespeichert"
+            "en": "<div>The envelope below shows the address that we have recorded. You can change this by answering any remaining questions above, or by clicking the pencil icons below. We do not need you to provide a recipient's name or any of the parts shown in <span style='color: #4e7ce8'>[blue]</span>.</div><div style='background: #f1d592; min-height: 270px; border-radius: 2px; padding: 1rem 1rem 2rem 7rem; margin: 1rem; box-shadow: 0 2px 5px 0px rgba(0,0,0,.6)' class='flex flex-col'><img src='./assets/themes/uk_addresses/stamp-outline.png' class='self-end w-16'/><div>{addr:unit} {addr:housename}</div><div>{addr:housenumber} {addr:street}</div><div>{addr:parentstreet}</div><div style='color: #4e7ce8'>[Suburb]</div><div  style='color: #4e7ce8'>[Town]</div><div style='color: #4e7ce8'>[Postal code]</div></div>"
+          },
+          "mappings": [
+            {
+              "if": "addr:substreet~*",
+              "then": "<div>The envelope below shows the address that we have recorded. You can change this by answering any remaining questions above, or by clicking the pencil icons below. We do not need you to provide a recipient's name or any of the parts shown in <span style='color: #4e7ce8'>[blue]</span>.</div><div style='background: #f1d592; min-height: 270px; border-radius: 2px; padding: 1rem 1rem 2rem 7rem; margin: 1rem; box-shadow: 0 2px 5px 0px rgba(0,0,0,.6)' class='flex flex-col'><img src='./assets/themes/uk_addresses/stamp-outline.png' class='self-end w-16'/><div>{addr:unit} {addr:housename}</div><div>{addr:housenumber} {addr:substreet}</div><div>{addr:street}</div><div>{addr:parentstreet}</div><div style='color: #4e7ce8'>[Suburb]</div><div style='color: #4e7ce8'>[Town]</div><div style='color: #4e7ce8'>[Postal code]</div></div>"
+            }
+          ]
+        },
+        {
+          "id": "uk_addresses_unit",
+          "render": "<b>{addr:unit}</b>",
+          "question": {
+            "en": "What is the sub-unit for this address? <div class='subtle'>Some named building or large complexes are split into sub-units (e.g. \"1\", \"Flat 2\", \"Unit C\")</div>"
+          },
+          "freeform": {
+            "key": "addr:unit"
+          },
+          "mappings": [
+            {
+              "if": "addr:unit=",
+              "then": "<div class='subtle'>Sub-unit (e.g. \"1\", \"Flat 2\", \"Unit C\")</div>",
+              "hideInAnswer": true
+            },
+            {
+              "if": "addr:unit=",
+              "then": "There is no sub-unit within this address"
+            }
+          ],
+          "condition": {
+            "or": [
+              "addr:housenumber~*",
+              "addr:housename~*",
+              "addr:substreet~*"
+            ]
           }
         },
         {
-          "id": "uk_addresses_housenumber",
-          "render": {
-            "en": "The housenumber is <b>{addr:housenumber}</b>",
-            "nl": "Het huisnummer is <b>{addr:housenumber}</b>",
-            "de": "Die Hausnummer ist <b>{addr:housenumber}</b>"
+          "id": "uk_addresses_housename",
+          "question": "What is the house or building name for this address?<div class='subtle'>As shown on a sign (e.g. \"Rose Cottage\", \"Broadcasting House\", \"Acme Corp HQ\"). Please do NOT add names of the people who live here!</div>",
+          "render": "<b>{addr:housename}</b>",
+          "freeform": {
+            "key": "addr:housename",
+            "addExtraTags": [
+              "nohousename="
+            ]
           },
+          "mappings": [
+            {
+              "if": {
+                "and": [
+                  "nohousename=yes",
+                  "addr:housename="
+                ]
+              },
+              "then": "<div class='subtle'>House or building name</div>",
+              "hideInAnswer": true
+            },
+            {
+              "if": {
+                "and": [
+                  "nohousename=yes",
+                  "addr:housename="
+                ]
+              },
+              "then": "This building has no housename"
+            },
+            {
+              "#": "By adding nohousenumber!=yes, this option will trigger when first added, but will be untriggered if a housenumber is added, resulting in the question poping up!",
+              "if": {
+                "and": [
+                  "addr:housename=",
+                  "nohousenumber!=yes"
+                ]
+              },
+              "then": "<div class='subtle'>House or building name</div>",
+              "hideInAnswer": true
+            }
+          ]
+        },
+        {
+          "id": "uk_addresses_housenumber",
+          "render": "<b>{addr:housenumber}</b>",
           "question": {
-            "en": "What is the number of this house?",
-            "de": "Wie lautet die Nummer dieses Hauses?"
+            "en": "What is the house or building number for this address?"
           },
           "freeform": {
             "key": "addr:housenumber",
@@ -261,7 +331,20 @@
             {
               "if": {
                 "and": [
-                  "nohousenumber=yes"
+                  "nohousenumber=yes",
+                  "addr:housenumber="
+                ]
+              },
+              "then": {
+                "en": "<div class='subtle'>Number (e.g. 1, 1A, 2)</div>"
+              },
+              "hideInAnswer": true
+            },
+            {
+              "if": {
+                "and": [
+                  "nohousenumber=yes",
+                  "addr:housenumber="
                 ]
               },
               "then": {
@@ -273,64 +356,89 @@
           ]
         },
         {
-          "id": "uk_addresses_housename",
-          "question": "What is the name of this house?<br/>This is normally indicated on a plaque.<br><div class='subtle'>Do NOT add names of inhabitants!</div>",
-          "render": "This house is named <b>{addr:housename}</b>",
+          "id": "uk_addresses_placename",
+          "question": {
+            "en": "What is the place or locality for this address?<div class='subtle'>This is additional information that appears before (or instead of) a street name in the address (e.g. \"The Cross\", \"West Business Park\", \"Castle Mews\")</div>"
+          },
+          "render": {
+            "en": "<b>{addr:substreet}</b>"
+          },
           "freeform": {
-            "key": "addr:housename",
-            "addExtraTags": [
-              "nohousename="
-            ]
+            "key": "addr:substreet",
+              "addExtraTags": [
+                "addr:parentstreet:={addr:street}",
+                "addr:street="
+              ]  
           },
           "mappings": [
             {
-              "if": "nohousename=yes",
-              "then": "This building has no housename"
+              "if": "addr:substreet=",
+              "then": {
+                "en": "<div class='subtle'>Place (e.g. \"Castle Mews\", \"West Business Park\")</div>"
+              },
+              "hideInAnswer": true
             },
             {
-              "#": "By adding nohousenumber!=yes, this option will trigger when first added, but will be untriggered if a housenumber is added, resulting in the question poping up!",
-              "if": {
-                "and": [
-                  "addr:housename=",
-                  "nohousenumber!=yes"
-                ]
-              },
-              "then": "This building has no housename",
-              "hideInAnswer": true
+              "if": "addr:substreet=",
+              "then": {
+                "en": "No extra place name is given or needed"
+              }
             }
-          ]
+          ],
+          "condition": "addr:parentstreet="
         },
         {
-          "id": "uk_addresses_unit",
-          "render": "The sub-part of this address is <b>{addr:unit}</b>",
+          "id": "uk_addresses_placename_with_parent",
           "question": {
-            "en": "What is the unit indication of this address? <div class='subtle'>This is the letter or number of the letterbox here, if multiple letterboxes share the same street and housenumber. If there are multiple at the same location, add them here with a <b>;</b> between them</div>"
+            "en": "What is the place or locality for this address?<div class='subtle'>This is additional information that appears before (or instead of) a street name in the address (e.g. \"The Cross\", \"West Business Park\", \"Castle Mews\")</div>"
+          },
+          "render": {
+            "en": "<b>{addr:substreet}</b>"
           },
           "freeform": {
-            "key": "addr:unit"
+            "key": "addr:substreet",
+              "addExtraTags": [
+                "addr:street="
+              ]  
           },
           "mappings": [
             {
-              "if": "addr:unit=",
-              "then": "This address has no subparts. <div class='subtle'>Subparts are e.g. appartment numbers, extra letters or numbers if there are multiple letterboxes, ...</div>"
+              "if": "addr:substreet=",
+              "then": {
+                "en": "<div class='subtle'>Place (e.g. \"Castle Mews\", \"West Business Park\")</div>"
+              },
+              "hideInAnswer": true
+            },
+            {
+              "if": "addr:substreet=",
+              "then": {
+                "en": "No extra place name is given or needed"
+              }
             }
           ],
           "condition": {
             "or": [
-              "addr:housenumber~*",
-              "addr:housename~*"
+              {
+                "and": [
+                  "addr:parentstreet~*",
+                  "addr:street="
+                ]
+              },
+              {
+                "and": [
+                  "addr:parentstreet~*",
+                  "addr:street~*",
+                  "addr:substreet~*"
+                ]
+              }
             ]
           }
         },
         {
           "id": "uk_addresses_street",
-          "render": {
-            "en": "This address is in street <b>{addr:street}</b>",
-            "de": "Diese Adresse befindet sich in der Straße <b>{addr:street}</b>"
-          },
+          "render": "<b>{addr:street}</b>",
           "question": {
-            "en": "What street is this address located in?",
-            "de": "In welcher Straße befindet sich diese Adresse?"
+            "en": "What is the street name for this address?"
           },
           "freeform": {
             "key": "addr:street"
@@ -338,75 +446,93 @@
           "mappings": [
             {
               "if": "addr:street:={_closest_street:0:name}",
-              "then": "This address is in street <b>{_closest_street:0:name}</b>",
+              "then": "<b>{_closest_street:0:name}</b>",
               "hideInAnswer": "_closest_street:0:name="
             },
             {
               "if": "addr:street:={_closest_street:1:name}",
-              "then": "This address is in street <b>{_closest_street:1:name}</b>",
+              "then": "<b>{_closest_street:1:name}</b>",
               "hideInAnswer": "_closest_street:1:name="
             },
             {
               "if": "addr:street:={_closest_street:2:name}",
-              "then": "This address is in street <b>{_closest_street:2:name}</b>",
+              "then": "<b>{_closest_street:2:name}</b>",
               "hideInAnswer": "_closest_street:2:name="
             }
-          ]
-        },
-        {
-          "id": "uk_addresses_placename",
-          "question": {
-            "en": "What is the place or locality?<div class='subtle'>This is additional information if the streetname alone isn't enough to find this address. Typical examples are 'Technology Park', 'XYZ Terrace', ...</div>"
-          },
-          "render": {
-            "en": "The placename is <b>{addr:place}</b>"
-          },
-          "freeform": {
-            "key": "addr:place"
-          },
-          "mappings": [
-            {
-              "if": "addr:place=",
-              "then": {
-                "en": "No extra placename is given or needed"
-              }
-            }
-          ]
-        },
-        {
-          "id": "fixme",
-          "render": "<b>This address is complicated - therefore someone has given a description of what should be fixed:</b>{fixme}",
-          "question": {
-            "en": "What should be fixed here? Please explain what the address is"
-          },
-          "freeform": {
-            "key": "fixme"
-          },
-          "mappings": [
-            {
-              "if": "fixme=",
-              "then": "Is this address complicated? Write something here to explain this case. An experienced mapper will have a look at it"
-            }
-          ]
-        },
-        "questions",
-        {
-          "id": "address-sign-image",
-          "render": {
-            "en": "{image_carousel(image:address)}<br/>{image_upload(image:address, Add image of the address)}"
+          ],
+          "condition": {
+                  "or": [
+                    "addr:street~*",
+                    "addr:substreet="
+                  ]
           }
         },
         {
-          "id": "preview",
-          "render": {
-            "en": "To send a letter to this addres, you would write:<div style='background: #fcdf94; border: 2px solid black; border-radius: 1rem; padding: 1.5rem 0.5rem 2rem 8rem; margin: 1rem' class='flex flex-col'><img src='./assets/themes/uk_addresses/stamp.jpg' class='self-end w-16'/><div class='subtle'>Name of the inhabitant</div><div>{addr:housename}</div><div>{addr:unit} {addr:housenumber} {addr:street}</div><div>{addr:place}</div><div class='subtle'>Suburb</div><div class='subtle'>Town</div><div class='subtle'>Postal code</div></div>"
+          "id": "uk_addresses_parentstreet",
+          "render": "<b>{addr:parentstreet}</b>",
+          "question": {
+            "en": "What is the parent street name for this address?<div class='subtle'>This street name will appear after the place name or first street name in the address</div>"
+          },
+          "freeform": {
+            "key": "addr:parentstreet"
           },
           "mappings": [
             {
-              "if": "addr:place~*",
-              "then": "To send a letter to this address, you would write:<div style='background: #fcdf94; border: 2px solid black; border-radius: 1rem; padding: 1.5rem 0.5rem 2rem 8rem; margin: 1rem' class='flex flex-col'><img src='./assets/themes/uk_addresses/stamp.jpg' class='self-end w-16'/><div class='subtle'>Name of the inhabitant</div><div>{addr:unit} {addr:housename}</div><div>{addr:housenumber} {addr:place}</div><div>{addr:street}</div><div class='subtle'>Suburb</div><div class='subtle'>Town</div><div class='subtle'>Postal code</div></div>"
+              "if": "addr:parentstreet=",
+              "then": {
+                "en": "<div class='subtle'>Parent street name</div>"
+              },
+              "hideInAnswer": true
+            },
+            {
+              "if": "addr:parentstreet=",
+              "then": "No parent street name is needed within this address"
+            },
+            {
+              "if": "addr:parentstreet:={_closest_street:0:name}",
+              "then": "<b>{_closest_street:0:name}</b>",
+              "hideInAnswer": "_closest_street:0:name="
+            },
+            {
+              "if": "addr:parentstreet:={_closest_street:1:name}",
+              "then": "<b>{_closest_street:1:name}</b>",
+              "hideInAnswer": "_closest_street:1:name="
+            },
+            {
+              "if": "addr:parentstreet:={_closest_street:2:name}",
+              "then": "<b>{_closest_street:2:name}</b>",
+              "hideInAnswer": "_closest_street:2:name="
+            }
+          ],
+          "condition": {
+                  "or": [
+                    "addr:parentstreet~*",
+                    "addr:substreet~*"
+                  ]
+          }
+        },
+        {
+          "id": "fixme",
+          "render": "This address is complicated. We have recorded the following description: {fixme:addr}",
+          "question": {
+            "en": "Please explain what the address is so that someone else can look at it"
+          },
+          "freeform": {
+            "key": "fixme:addr"
+          },
+          "mappings": [
+            {
+              "if": "fixme:addr=",
+              "then": "Complicated address? Please click the pencil and write some text to describe the situation. You can also add a photo below if that helps",
+              "hideInAnswer": true
             }
           ]
+        },
+        {
+          "id": "address-sign-image",
+          "render": {
+            "en": "{image_carousel(image:address)}<br/>{image_upload(image:address, Too complex? Add a photo of the address)}"
+          }
         }
       ],
       "mapRendering": [
@@ -470,4 +596,4 @@
   ],
   "enableShareScreen": false,
   "enableMoreQuests": false
-}
+}