From 8e624b4122493a4ce4079b6b1e08873639faa584 Mon Sep 17 00:00:00 2001
From: Robin van der Linde <robin.vanderlinde@gmail.com>
Date: Tue, 11 Jan 2022 10:29:14 +0100
Subject: [PATCH 1/2] Fix build and add unmarked crossing (#609)

---
 assets/layers/barrier/barrier.json     |  2 +-
 assets/layers/crossings/crossings.json |  7 +++
 langs/layers/en.json                   | 80 ++++++++++++++++++++++++++
 langs/layers/nl.json                   |  3 +
 langs/themes/en.json                   | 60 -------------------
 5 files changed, 91 insertions(+), 61 deletions(-)

diff --git a/assets/layers/barrier/barrier.json b/assets/layers/barrier/barrier.json
index 0e7eae8e3..cc56a31a7 100644
--- a/assets/layers/barrier/barrier.json
+++ b/assets/layers/barrier/barrier.json
@@ -364,4 +364,4 @@
       "width": "5"
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/assets/layers/crossings/crossings.json b/assets/layers/crossings/crossings.json
index 0de0f52f3..2a1fff0c2 100644
--- a/assets/layers/crossings/crossings.json
+++ b/assets/layers/crossings/crossings.json
@@ -126,6 +126,13 @@
             "de": "Zebrastreifen"
           },
           "hideInAnswer": true
+        },
+        {
+          "if": "crossing=unmarked",
+          "then": {
+            "en": "Crossing without crossing markings",
+            "nl": "Oversteekplaats zonder kruispuntmarkeringen"
+          }
         }
       ]
     },
diff --git a/langs/layers/en.json b/langs/layers/en.json
index 9bf448acf..20c3bce1c 100644
--- a/langs/layers/en.json
+++ b/langs/layers/en.json
@@ -2169,6 +2169,9 @@
                     },
                     "2": {
                         "then": "Zebra crossing"
+                    },
+                    "3": {
+                        "then": "Crossing without crossing markings"
                     }
                 },
                 "question": "What kind of crossing is this?"
@@ -3294,6 +3297,83 @@
             }
         }
     },
+    "note": {
+        "filter": {
+            "0": {
+                "options": {
+                    "0": {
+                        "question": "Should mention {search} in the first comment"
+                    }
+                }
+            },
+            "1": {
+                "options": {
+                    "0": {
+                        "question": "Should <b>not</b> mention {search} in the first comment"
+                    }
+                }
+            },
+            "2": {
+                "options": {
+                    "0": {
+                        "question": "Opened by {search}"
+                    }
+                }
+            },
+            "3": {
+                "options": {
+                    "0": {
+                        "question": "<b>Not</b> opened by {search}"
+                    }
+                }
+            },
+            "4": {
+                "options": {
+                    "0": {
+                        "question": "Opened before {search}"
+                    }
+                }
+            },
+            "5": {
+                "options": {
+                    "0": {
+                        "question": "Opened after {search}"
+                    }
+                }
+            },
+            "6": {
+                "options": {
+                    "0": {
+                        "question": "Opened by anonymous user"
+                    }
+                }
+            },
+            "7": {
+                "options": {
+                    "0": {
+                        "question": "Only show open notes"
+                    }
+                }
+            }
+        },
+        "name": "OpenStreetMap notes",
+        "tagRenderings": {
+            "report-contributor": {
+                "render": "<a href='https://www.openstreetmap.org/reports/new?reportable_id={_first_user_id}&reportable_type=User' target='_blank' class='subtle'>Report {_first_user} as spam</a>"
+            },
+            "report-note": {
+                "render": "<a href='https://www.openstreetmap.org/reports/new?reportable_id={id}&reportable_type=Note' target='_blank'>Report this note as spam or inappropriate</a>"
+            }
+        },
+        "title": {
+            "mappings": {
+                "0": {
+                    "then": "Closed note"
+                }
+            },
+            "render": "Note"
+        }
+    },
     "observation_tower": {
         "description": "Towers with a panoramic view",
         "name": "Observation towers",
diff --git a/langs/layers/nl.json b/langs/layers/nl.json
index 0b49ddb23..f4fbe7cc7 100644
--- a/langs/layers/nl.json
+++ b/langs/layers/nl.json
@@ -2180,6 +2180,9 @@
                     },
                     "2": {
                         "then": "Zebrapad"
+                    },
+                    "3": {
+                        "then": "Oversteekplaats zonder kruispuntmarkeringen"
                     }
                 },
                 "question": "Wat voor oversteekplaats is dit?"
diff --git a/langs/themes/en.json b/langs/themes/en.json
index 1364ca325..cd69694b4 100644
--- a/langs/themes/en.json
+++ b/langs/themes/en.json
@@ -944,66 +944,6 @@
         "shortDescription": "This map shows the nature reserves of Natuurpunt",
         "title": "The map of Natuurpunt"
     },
-    "notes": {
-        "layers": {
-            "0": {
-                "filter": {
-                    "0": {
-                        "options": {
-                            "0": {
-                                "question": "Should mention {search} in the first comment"
-                            }
-                        }
-                    },
-                    "1": {
-                        "options": {
-                            "0": {
-                                "question": "Should <b>not</b> mention {search} in the first comment"
-                            }
-                        }
-                    },
-                    "2": {
-                        "options": {
-                            "0": {
-                                "question": "Opened by {search}"
-                            }
-                        }
-                    },
-                    "3": {
-                        "options": {
-                            "0": {
-                                "question": "<b>Not</b> opened by {search}"
-                            }
-                        }
-                    },
-                    "4": {
-                        "options": {
-                            "0": {
-                                "question": "Opened by anonymous user"
-                            }
-                        }
-                    }
-                },
-                "name": "OpenStreetMap notes",
-                "tagRenderings": {
-                    "report-contributor": {
-                        "render": "<a href='https://www.openstreetmap.org/reports/new?reportable_id={_first_user_id}&reportable_type=User' target='_blank' class='subtle'>Report {_first_user} as spam</a>"
-                    },
-                    "report-note": {
-                        "render": "<a href='https://www.openstreetmap.org/reports/new?reportable_id={id}&reportable_type=Note' target='_blank'>Report this note as spam or inappropriate</a>"
-                    }
-                },
-                "title": {
-                    "mappings": {
-                        "0": {
-                            "then": "Closed note"
-                        }
-                    },
-                    "render": "Note"
-                }
-            }
-        }
-    },
     "observation_towers": {
         "description": "Publicly accessible towers to enjoy the view",
         "shortDescription": "Publicly accessible towers to enjoy the view",

From 1cf62b30c1b511cd813ae3939eb749a5e170816f Mon Sep 17 00:00:00 2001
From: Robin van der Linde <robin.vanderlinde@gmail.com>
Date: Tue, 11 Jan 2022 10:55:17 +0100
Subject: [PATCH 2/2] Remove semicolon, add space

---
 scripts/build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/build.sh b/scripts/build.sh
index d2e91ded7..30551dc36 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -14,7 +14,7 @@ npm run generate &&
 npm run test &&
 npm run generate:layouts
 
-if [ $? -ne 0]; then;
+if [ $? -ne 0 ]; then
     echo "ERROR"
     exit 1
 fi