From 6d1e546607fd6cfe7dec0381f7184ccb4f1ea5ce Mon Sep 17 00:00:00 2001 From: Bryan Housel Date: Sun, 5 May 2019 18:43:06 -0400 Subject: [PATCH] Fix "Summit Cross" capitalization, npm run build for new presets --- data/presets.yaml | 43 ++++++++++++++++++++++++ data/presets/presets.json | 11 +++++- data/presets/presets/man_made/cross.json | 4 +-- data/taginfo.json | 9 +++++ dist/locales/en.json | 36 ++++++++++++++++++++ svg/fontawesome/fas-crown.svg | 1 + svg/fontawesome/fas-dungeon.svg | 1 + 7 files changed, 102 insertions(+), 3 deletions(-) create mode 100644 svg/fontawesome/fas-crown.svg create mode 100644 svg/fontawesome/fas-dungeon.svg diff --git a/data/presets.yaml b/data/presets.yaml index 5b0b4f95c..da1dbb93a 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -3490,6 +3490,11 @@ en: # barrier=retaining_wall name: Retaining Wall terms: '' + barrier/sally_port: + # barrier=sally_port + name: Sally Port + # 'terms: Postern,castle side gate' + terms: '' barrier/stile: # barrier=stile name: Stile @@ -4548,6 +4553,36 @@ en: # historic=castle name: Castle terms: '' + historic/castle/fortress: + # 'historic=castle, castle_type=fortress' + name: Historic Fortress + # 'terms: citadel,military' + terms: '' + historic/castle/palace: + # 'historic=castle, castle_type=palace' + name: Palace + # 'terms: Royal Residence,royal,king,queen' + terms: '' + historic/castle/stately: + # 'historic=castle, castle_type=stately' + name: Château + # 'terms: Historic Country House,Stately Home,nobility,gentry,representative' + terms: '' + historic/city_gate: + # historic=city_gate + name: City Gate + # 'terms: Town Gate' + terms: '' + historic/fort: + # historic=fort + name: Historic Fort + # 'terms: military' + terms: '' + historic/manor: + # historic=manor + name: Manor House + # 'terms: Mansion,gentry,nobility,estate' + terms: '' historic/memorial: # historic=memorial name: Memorial @@ -5269,6 +5304,10 @@ en: # man_made=crane name: Crane terms: '' + man_made/cross: + # man_made=cross + name: Summit Cross + terms: '' man_made/cutline: # man_made=cutline name: Cut line @@ -5628,6 +5667,10 @@ en: name: Lake # 'terms: lakelet,loch,mere' terms: '' + natural/water/moat: + # 'natural=water, water=moat' + name: Moat + terms: '' natural/water/pond: # 'natural=water, water=pond' name: Pond diff --git a/data/presets/presets.json b/data/presets/presets.json index 040e43d05..79d1d3edf 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -278,6 +278,7 @@ "barrier/kissing_gate": {"icon": "maki-barrier", "fields": ["access"], "geometry": ["vertex"], "tags": {"barrier": "kissing_gate"}, "name": "Kissing Gate"}, "barrier/lift_gate": {"icon": "maki-roadblock", "fields": ["access"], "geometry": ["vertex", "line"], "tags": {"barrier": "lift_gate"}, "name": "Lift Gate"}, "barrier/retaining_wall": {"icon": "temaki-wall", "fields": ["height", "material"], "geometry": ["line", "area"], "tags": {"barrier": "retaining_wall"}, "name": "Retaining Wall"}, + "barrier/sally_port": {"icon": "fas-dungeon", "geometry": ["vertex"], "tags": {"barrier": "sally_port"}, "terms": ["Postern", "castle side gate"], "name": "Sally Port"}, "barrier/stile": {"icon": "maki-roadblock", "fields": ["access"], "geometry": ["vertex"], "tags": {"barrier": "stile"}, "name": "Stile"}, "barrier/toll_booth": {"icon": "maki-roadblock", "fields": ["access", "building_area", "payment_multi", "currency_multi"], "moreFields": ["address", "website", "phone", "email", "fax"], "geometry": ["vertex", "area"], "tags": {"barrier": "toll_booth"}, "name": "Toll Booth"}, "barrier/turnstile": {"icon": "maki-roadblock", "fields": ["access"], "geometry": ["vertex"], "terms": ["baffle gate", "turnstyle"], "tags": {"barrier": "turnstile"}, "name": "Turnstile"}, @@ -514,7 +515,13 @@ "historic": {"icon": "temaki-ruins", "fields": ["historic", "inscription"], "geometry": ["point", "vertex", "line", "area"], "tags": {"historic": "*"}, "name": "Historic Site"}, "historic/archaeological_site": {"icon": "temaki-ruins", "fields": ["name", "site_type", "historic/civilization", "inscription", "access_simple"], "geometry": ["point", "vertex", "area"], "tags": {"historic": "archaeological_site"}, "name": "Archaeological Site"}, "historic/boundary_stone": {"icon": "temaki-milestone", "fields": ["name", "inscription"], "moreFields": ["material"], "geometry": ["point", "vertex"], "tags": {"historic": "boundary_stone"}, "name": "Boundary Stone"}, - "historic/castle": {"icon": "maki-castle", "fields": ["name", "castle_type", "building_area", "historic/civilization", "access_simple"], "geometry": ["point", "area"], "tags": {"historic": "castle"}, "name": "Castle"}, + "historic/castle": {"icon": "maki-castle", "fields": ["name", "castle_type", "building_area", "historic/civilization", "access_simple", "start_date"], "geometry": ["point", "area"], "tags": {"historic": "castle"}, "name": "Castle"}, + "historic/castle/fortress": {"icon": "maki-castle", "fields": ["name", "building_area", "access_simple", "start_date"], "geometry": ["point", "area"], "reference": {"key": "castle_type", "value": "fortress"}, "tags": {"historic": "castle", "castle_type": "fortress"}, "terms": ["citadel", "military"], "name": "Historic Fortress"}, + "historic/castle/palace": {"icon": "fas-crown", "fields": ["name", "building_area", "access_simple", "start_date"], "geometry": ["point", "area"], "reference": {"key": "castle_type", "value": "palace"}, "tags": {"historic": "castle", "castle_type": "palace"}, "terms": ["Royal Residence", "royal", "king", "queen"], "name": "Palace"}, + "historic/castle/stately": {"icon": "fas-crown", "fields": ["name", "building_area", "access_simple", "start_date"], "geometry": ["point", "area"], "reference": {"key": "castle_type", "value": "stately"}, "tags": {"historic": "castle", "castle_type": "stately"}, "terms": ["Historic Country House", "Stately Home", "nobility", "gentry", "representative"], "name": "Château"}, + "historic/city_gate": {"icon": "maki-castle", "fields": ["name", "building_area", "historic/civilization", "start_date"], "geometry": ["point", "area"], "tags": {"historic": "city_gate"}, "terms": ["Town Gate"], "name": "City Gate"}, + "historic/fort": {"icon": "maki-castle", "fields": ["name", "building_area", "access_simple", "start_date"], "geometry": ["point", "area"], "tags": {"historic": "fort"}, "terms": ["military"], "name": "Historic Fort"}, + "historic/manor": {"icon": "maki-castle", "fields": ["name", "building_area", "access_simple", "start_date"], "geometry": ["point", "area"], "tags": {"historic": "manor"}, "terms": ["Mansion", "gentry", "nobility", "estate"], "name": "Manor House"}, "historic/memorial": {"icon": "maki-monument", "fields": ["name", "memorial", "inscription", "material"], "moreFields": ["website"], "geometry": ["point", "vertex", "area"], "terms": ["dedicatory", "epitaph", "remember", "remembrance", "memory", "monument", "stolperstein"], "tags": {"historic": "memorial"}, "name": "Memorial"}, "historic/memorial/plaque": {"icon": "maki-monument", "fields": ["{historic/memorial}", "direction"], "geometry": ["point", "vertex"], "terms": ["dedicatory", "epitaph", "historical marker", "remember", "remembrance", "memory"], "tags": {"historic": "memorial", "memorial": "plaque"}, "reference": {"key": "memorial", "value": "plaque"}, "name": "Commemorative Plaque"}, "historic/monument": {"icon": "maki-monument", "fields": ["name", "inscription", "access_simple"], "moreFields": ["material"], "geometry": ["point", "vertex", "area"], "tags": {"historic": "monument"}, "name": "Monument"}, @@ -669,6 +676,7 @@ "man_made/chimney": {"icon": "temaki-chimney", "fields": ["operator", "material", "height"], "geometry": ["point", "area"], "tags": {"man_made": "chimney"}, "name": "Chimney"}, "man_made/clearcut": {"icon": "maki-logging", "geometry": ["area"], "tags": {"man_made": "clearcut"}, "terms": ["cut", "forest", "lumber", "tree", "wood"], "name": "Clearcut Forest"}, "man_made/crane": {"icon": "temaki-crane", "fields": ["operator", "manufacturer", "height", "crane/type"], "geometry": ["point", "line", "vertex", "area"], "tags": {"man_made": "crane"}, "name": "Crane"}, + "man_made/cross": {"icon": "maki-religious-christian", "fields": ["name", "material", "height", "elevation", "inscription", "direction"], "geometry": ["point", "vertex"], "tags": {"man_made": "cross"}, "name": "Summit Cross"}, "man_made/cutline": {"icon": "maki-logging", "geometry": ["line"], "tags": {"man_made": "cutline"}, "name": "Cut line"}, "man_made/dyke": {"geometry": ["line"], "tags": {"man_made": "dyke"}, "terms": ["Dike", "Dyke", "Floodbank", "Stopbank"], "name": "Levee"}, "man_made/embankment": {"geometry": ["line"], "tags": {"man_made": "embankment"}, "name": "Embankment"}, @@ -744,6 +752,7 @@ "natural/water/basin": {"icon": "maki-water", "fields": ["name", "basin", "intermittent_yes"], "geometry": ["area"], "tags": {"natural": "water", "water": "basin"}, "reference": {"key": "water", "value": "basin"}, "terms": ["detention", "drain", "overflow", "rain", "retention"], "name": "Basin"}, "natural/water/canal": {"icon": "iD-waterway-canal", "fields": ["{natural/water}", "salt"], "geometry": ["area"], "tags": {"natural": "water", "water": "canal"}, "reference": {"key": "water", "value": "canal"}, "name": "Canal"}, "natural/water/lake": {"icon": "maki-water", "fields": ["{natural/water}", "salt", "tidal"], "geometry": ["area"], "tags": {"natural": "water", "water": "lake"}, "reference": {"key": "water", "value": "lake"}, "terms": ["lakelet", "loch", "mere"], "name": "Lake"}, + "natural/water/moat": {"icon": "maki-water", "fields": ["{natural/water}", "salt"], "geometry": ["area"], "tags": {"natural": "water", "water": "moat"}, "name": "Moat"}, "natural/water/pond": {"icon": "maki-water", "fields": ["{natural/water}", "salt"], "geometry": ["area"], "tags": {"natural": "water", "water": "pond"}, "reference": {"key": "water", "value": "pond"}, "terms": ["lakelet", "millpond", "tarn", "pool", "mere"], "name": "Pond"}, "natural/water/reservoir": {"icon": "maki-water", "geometry": ["area"], "tags": {"natural": "water", "water": "reservoir"}, "reference": {"key": "water", "value": "reservoir"}, "name": "Reservoir"}, "natural/water/river": {"icon": "iD-waterway-river", "fields": ["{natural/water}", "tidal"], "geometry": ["area"], "tags": {"natural": "water", "water": "river"}, "reference": {"key": "water", "value": "river"}, "terms": ["beck", "branch", "brook", "course", "creek", "estuary", "rill", "riverbank", "rivulet", "run", "runnel", "stream", "tributary", "watercourse"], "name": "River"}, diff --git a/data/presets/presets/man_made/cross.json b/data/presets/presets/man_made/cross.json index aa62e0d5e..5e8c56f26 100644 --- a/data/presets/presets/man_made/cross.json +++ b/data/presets/presets/man_made/cross.json @@ -4,7 +4,7 @@ "name", "material", "height", - "ele", + "elevation", "inscription", "direction" ], @@ -15,5 +15,5 @@ "tags": { "man_made": "cross" }, - "name": "Summit cross" + "name": "Summit Cross" } diff --git a/data/taginfo.json b/data/taginfo.json index 8d81162c9..547c61b7b 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -275,6 +275,7 @@ {"key": "barrier", "value": "kissing_gate", "description": "🄿 Kissing Gate", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/barrier-15.svg?sanitize=true"}, {"key": "barrier", "value": "lift_gate", "description": "🄿 Lift Gate", "object_types": ["node", "way"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/roadblock-15.svg?sanitize=true"}, {"key": "barrier", "value": "retaining_wall", "description": "🄿 Retaining Wall", "object_types": ["way", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/wall.svg?sanitize=true"}, + {"key": "barrier", "value": "sally_port", "description": "🄿 Sally Port", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/fas-dungeon.svg?sanitize=true"}, {"key": "barrier", "value": "stile", "description": "🄿 Stile", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/roadblock-15.svg?sanitize=true"}, {"key": "barrier", "value": "toll_booth", "description": "🄿 Toll Booth", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/roadblock-15.svg?sanitize=true"}, {"key": "barrier", "value": "turnstile", "description": "🄿 Turnstile", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/roadblock-15.svg?sanitize=true"}, @@ -495,6 +496,12 @@ {"key": "historic", "value": "archaeological_site", "description": "🄿 Archaeological Site", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/ruins.svg?sanitize=true"}, {"key": "historic", "value": "boundary_stone", "description": "🄿 Boundary Stone", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/milestone.svg?sanitize=true"}, {"key": "historic", "value": "castle", "description": "🄿 Castle", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/castle-15.svg?sanitize=true"}, + {"key": "castle_type", "value": "fortress", "description": "🄿 Historic Fortress", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/castle-15.svg?sanitize=true"}, + {"key": "castle_type", "value": "palace", "description": "🄿 Palace", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/fas-crown.svg?sanitize=true"}, + {"key": "castle_type", "value": "stately", "description": "🄿 Château", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/fas-crown.svg?sanitize=true"}, + {"key": "historic", "value": "city_gate", "description": "🄿 City Gate", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/castle-15.svg?sanitize=true"}, + {"key": "historic", "value": "fort", "description": "🄿 Historic Fort", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/castle-15.svg?sanitize=true"}, + {"key": "historic", "value": "manor", "description": "🄿 Manor House", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/castle-15.svg?sanitize=true"}, {"key": "historic", "value": "memorial", "description": "🄿 Memorial", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/monument-15.svg?sanitize=true"}, {"key": "memorial", "value": "plaque", "description": "🄿 Commemorative Plaque", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/monument-15.svg?sanitize=true"}, {"key": "historic", "value": "monument", "description": "🄿 Monument", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/monument-15.svg?sanitize=true"}, @@ -642,6 +649,7 @@ {"key": "man_made", "value": "chimney", "description": "🄿 Chimney", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/chimney.svg?sanitize=true"}, {"key": "man_made", "value": "clearcut", "description": "🄿 Clearcut Forest", "object_types": ["area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/logging-15.svg?sanitize=true"}, {"key": "man_made", "value": "crane", "description": "🄿 Crane", "object_types": ["node", "way", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/crane.svg?sanitize=true"}, + {"key": "man_made", "value": "cross", "description": "🄿 Summit Cross", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/religious-christian-15.svg?sanitize=true"}, {"key": "man_made", "value": "cutline", "description": "🄿 Cut line", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/logging-15.svg?sanitize=true"}, {"key": "man_made", "value": "dyke", "description": "🄿 Levee", "object_types": ["way"]}, {"key": "man_made", "value": "embankment", "description": "🄿 Embankment", "object_types": ["way"]}, @@ -714,6 +722,7 @@ {"key": "water", "value": "basin", "description": "🄿 Basin", "object_types": ["area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/water-15.svg?sanitize=true"}, {"key": "water", "value": "canal", "description": "🄿 Canal", "object_types": ["area"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/waterway-canal.svg?sanitize=true"}, {"key": "water", "value": "lake", "description": "🄿 Lake", "object_types": ["area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/water-15.svg?sanitize=true"}, + {"key": "water", "value": "moat", "description": "🄿 Moat", "object_types": ["area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/water-15.svg?sanitize=true"}, {"key": "water", "value": "pond", "description": "🄿 Pond", "object_types": ["area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/water-15.svg?sanitize=true"}, {"key": "water", "value": "reservoir", "description": "🄿 Reservoir", "object_types": ["area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/water-15.svg?sanitize=true"}, {"key": "water", "value": "river", "description": "🄿 River", "object_types": ["area"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/waterway-river.svg?sanitize=true"}, diff --git a/dist/locales/en.json b/dist/locales/en.json index 0ad98bf16..62ee72e8a 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -5373,6 +5373,10 @@ "name": "Retaining Wall", "terms": "" }, + "barrier/sally_port": { + "name": "Sally Port", + "terms": "Postern,castle side gate" + }, "barrier/stile": { "name": "Stile", "terms": "" @@ -6321,6 +6325,30 @@ "name": "Castle", "terms": "" }, + "historic/castle/fortress": { + "name": "Historic Fortress", + "terms": "citadel,military" + }, + "historic/castle/palace": { + "name": "Palace", + "terms": "Royal Residence,royal,king,queen" + }, + "historic/castle/stately": { + "name": "Château", + "terms": "Historic Country House,Stately Home,nobility,gentry,representative" + }, + "historic/city_gate": { + "name": "City Gate", + "terms": "Town Gate" + }, + "historic/fort": { + "name": "Historic Fort", + "terms": "military" + }, + "historic/manor": { + "name": "Manor House", + "terms": "Mansion,gentry,nobility,estate" + }, "historic/memorial": { "name": "Memorial", "terms": "dedicatory,epitaph,remember,remembrance,memory,monument,stolperstein" @@ -6937,6 +6965,10 @@ "name": "Crane", "terms": "" }, + "man_made/cross": { + "name": "Summit Cross", + "terms": "" + }, "man_made/cutline": { "name": "Cut line", "terms": "" @@ -7237,6 +7269,10 @@ "name": "Lake", "terms": "lakelet,loch,mere" }, + "natural/water/moat": { + "name": "Moat", + "terms": "" + }, "natural/water/pond": { "name": "Pond", "terms": "lakelet,millpond,tarn,pool,mere" diff --git a/svg/fontawesome/fas-crown.svg b/svg/fontawesome/fas-crown.svg new file mode 100644 index 000000000..9d4f6d378 --- /dev/null +++ b/svg/fontawesome/fas-crown.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/svg/fontawesome/fas-dungeon.svg b/svg/fontawesome/fas-dungeon.svg new file mode 100644 index 000000000..c2adfaa90 --- /dev/null +++ b/svg/fontawesome/fas-dungeon.svg @@ -0,0 +1 @@ + \ No newline at end of file