Merge pull request #613 from pietervdvn/crossing-fix

Fix build and add unmarked crossing (#609)

assets/layers/barrier/barrier.json

@@ -364,4 +364,4 @@
       "width": "5"
     }
   ]
-}
+}

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"
+          }
         }
       ]
     },

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",

langs/layers/nl.json

@@ -2180,6 +2180,9 @@
                     },
                     "2": {
                         "then": "Zebrapad"
+                    },
+                    "3": {
+                        "then": "Oversteekplaats zonder kruispuntmarkeringen"
                     }
                 },
                 "question": "Wat voor oversteekplaats is dit?"

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",

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