Merge branch 'master' into validation

data/presets.yaml

@@ -2089,7 +2089,7 @@ en:
         # website=*
         label: Website
         # website field placeholder
-        placeholder: 'http://example.com/'
+        placeholder: 'https://example.com'
       wetland:
         # wetland=*
         label: Type

data/presets/fields.json

@@ -362,7 +362,7 @@
     "water_volume": {"key": "water_volume", "type": "number", "label": "Water Reserve Volume (m³)", "snake_case": false},
     "water": {"key": "water", "type": "combo", "label": "Type"},
     "waterway": {"key": "waterway", "type": "typeCombo", "label": "Type"},
-    "website": {"key": "website", "type": "url", "icon": "website", "placeholder": "http://example.com/", "label": "Website"},
+    "website": {"key": "website", "type": "url", "icon": "website", "placeholder": "https://example.com", "label": "Website"},
     "wetland": {"key": "wetland", "type": "combo", "label": "Type"},
     "wheelchair": {"key": "wheelchair", "type": "radio", "options": ["yes", "limited", "no"], "icon": "maki-wheelchair", "label": "Wheelchair Access"},
     "wholesale": {"key": "wholesale", "type": "typeCombo", "label": "Wholesale"},

data/presets/fields/website.json

@@ -2,6 +2,6 @@
     "key": "website",
     "type": "url",
     "icon": "website",
-    "placeholder": "http://example.com/",
+    "placeholder": "https://example.com",
     "label": "Website"
 }

data/presets/presets.json

@@ -105,7 +105,7 @@
     "amenity/internet_cafe": {"icon": "temaki-antenna", "fields": ["name", "operator", "address", "building_area", "internet_access", "internet_access/fee", "internet_access/ssid"], "moreFields": ["opening_hours", "smoking", "outdoor_seating", "payment_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["cybercafe", "taxiphone", "teleboutique", "coffee", "cafe", "net", "lanhouse"], "tags": {"amenity": "internet_cafe"}, "name": "Internet Cafe"},
     "amenity/kindergarten": {"icon": "maki-school", "fields": ["name", "operator", "address"], "moreFields": ["opening_hours", "payment_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["kindergarden", "pre-school"], "tags": {"amenity": "kindergarten"}, "name": "Preschool/Kindergarten Grounds"},
     "amenity/language_school": {"icon": "maki-school", "fields": ["name", "operator", "address", "building_area", "opening_hours", "language_multi"], "moreFields": ["payment_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["esl"], "tags": {"amenity": "language_school"}, "name": "Language School"},
-    "amenity/library": {"icon": "maki-library", "fields": ["name", "operator", "building_area", "address", "ref/isil"], "moreFields": ["opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "website", "phone", "email", "fax", "wheelchair", "payment_multi"], "geometry": ["point", "area"], "terms": ["book"], "tags": {"amenity": "library"}, "name": "Library"},
+    "amenity/library": {"icon": "maki-library", "fields": ["name", "operator", "building_area", "address", "ref/isil", "internet_access"], "moreFields": ["access_simple", "opening_hours", "internet_access/fee", "internet_access/ssid", "website", "phone", "email", "fax", "wheelchair", "payment_multi"], "geometry": ["point", "area"], "terms": ["book"], "tags": {"amenity": "library"}, "name": "Library"},
     "amenity/love_hotel": {"icon": "maki-heart", "fields": ["name", "operator", "address", "building_area", "rooms", "internet_access"], "moreFields": ["smoking", "payment_multi", "internet_access/fee", "internet_access/ssid", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "love_hotel"}, "name": "Love Hotel"},
     "amenity/marketplace": {"icon": "maki-shop", "fields": ["name", "operator", "address", "building", "opening_hours"], "moreFields": ["website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "marketplace"}, "name": "Marketplace"},
     "amenity/monastery": {"icon": "maki-place-of-worship", "fields": ["name", "religion", "denomination", "address", "building_area"], "moreFields": ["website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["abbey", "basilica", "bethel", "cathedral", "chancel", "chantry", "chapel", "church", "fold", "house of God", "house of prayer", "house of worship", "minster", "mission", "monastery", "mosque", "oratory", "parish", "sacellum", "sanctuary", "shrine", "synagogue", "tabernacle", "temple"], "tags": {"amenity": "monastery"}, "name": "Monastery Grounds"},

data/presets/presets/amenity/library.json

@@ -5,11 +5,12 @@
         "operator",
         "building_area",
         "address",
-        "ref/isil"
+        "ref/isil",
+        "internet_access"
     ],
     "moreFields" : [
+        "access_simple",
         "opening_hours",
-        "internet_access",
         "internet_access/fee",
         "internet_access/ssid",
         "website",

dist/locales/en.json

@@ -3736,7 +3736,7 @@
                 },
                 "website": {
                     "label": "Website",
-                    "placeholder": "http://example.com/"
+                    "placeholder": "https://example.com"
                 },
                 "wetland": {
                     "label": "Type"

package.json

@@ -61,7 +61,7 @@
     "ecstatic": "^3.0.0",
     "editor-layer-index": "osmlab/editor-layer-index.git#gh-pages",
     "eslint": "^5.0.0",
-    "esm": "~3.1.0",
+    "esm": "~3.2.1",
     "gaze": "^1.1.1",
     "glob": "^7.1.0",
     "happen": "^0.3.1",