From b099872a8b11e0f856cc41dad9617dd32be5a345 Mon Sep 17 00:00:00 2001 From: Wille Marcel Date: Thu, 17 Aug 2017 10:12:29 -0300 Subject: [PATCH 01/20] add presets for theme park attractions --- data/presets.yaml | 71 +++++ data/presets/fields.json | 7 + data/presets/fields/species.json | 7 + data/presets/presets.json | 298 +++++++++++++++++- .../presets/attraction/amusement_ride.json | 20 ++ data/presets/presets/attraction/animal.json | 24 ++ .../presets/presets/attraction/big_wheel.json | 20 ++ .../presets/attraction/bumper_car.json | 21 ++ .../presets/attraction/bungee_jumping.json | 21 ++ data/presets/presets/attraction/carousel.json | 25 ++ .../presets/presets/attraction/dark_ride.json | 21 ++ .../presets/attraction/drop_tower.json | 24 ++ .../presets/attraction/pirate_ship.json | 20 ++ .../presets/attraction/river_rafting.json | 24 ++ .../presets/attraction/roller_coaster.json | 20 ++ data/presets/presets/attraction/train.json | 25 ++ .../presets/attraction/water_slide.json | 24 ++ data/presets/presets/natural/tree.json | 1 + data/taginfo.json | 52 +++ dist/locales/en.json | 58 +++- 20 files changed, 781 insertions(+), 2 deletions(-) create mode 100644 data/presets/fields/species.json create mode 100644 data/presets/presets/attraction/amusement_ride.json create mode 100644 data/presets/presets/attraction/animal.json create mode 100644 data/presets/presets/attraction/big_wheel.json create mode 100644 data/presets/presets/attraction/bumper_car.json create mode 100644 data/presets/presets/attraction/bungee_jumping.json create mode 100644 data/presets/presets/attraction/carousel.json create mode 100644 data/presets/presets/attraction/dark_ride.json create mode 100644 data/presets/presets/attraction/drop_tower.json create mode 100644 data/presets/presets/attraction/pirate_ship.json create mode 100644 data/presets/presets/attraction/river_rafting.json create mode 100644 data/presets/presets/attraction/roller_coaster.json create mode 100644 data/presets/presets/attraction/train.json create mode 100644 data/presets/presets/attraction/water_slide.json diff --git a/data/presets.yaml b/data/presets.yaml index 5895a11b2..f00b9e4ca 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -1219,6 +1219,11 @@ en: source: # source=* label: Source + species: + # species=* + label: Scientific Name + # species field placeholder + placeholder: Scientific name of the species sport: # sport=* label: Sports @@ -2101,6 +2106,71 @@ en: # 'area:highway=*' name: Road Surface terms: '' + attraction/amusement_ride: + # attraction=amusement_ride + name: Amusement Ride + # 'terms: theme park,carnival ride' + terms: '' + attraction/animal: + # attraction=animal + name: Animal + # 'terms: zoo,theme park,animal park,lion,tiger,bear' + terms: '' + attraction/big_wheel: + # attraction=big_wheel + name: Big Wheel + # 'terms: ferris wheel,theme park,amusement ride' + terms: '' + attraction/bumper_car: + # attraction=bumper_car + name: Bumper Car + # 'terms: theme park,dodgem cars,autoscooter' + terms: '' + attraction/bungee_jumping: + # attraction=bungee_jumping + name: Bungee Jumping + # 'terms: theme park,bungy jumping,jumping platform' + terms: '' + attraction/carousel: + # attraction=carousel + name: Carousel + # 'terms: theme park,roundabout,merry-go-round,galloper,jumper,horseabout,flying horses' + terms: '' + attraction/dark_ride: + # attraction=dark_ride + name: Dark Ride + # 'terms: theme park,ghost train' + terms: '' + attraction/drop_tower: + # attraction=drop_tower + name: Drop Tower + # 'terms: theme park,amusement ride,gondola,tower,big drop' + terms: '' + attraction/pirate_ship: + # attraction=pirate_ship + name: Pirate Ship + # 'terms: theme park,carnival ride,amusement ride' + terms: '' + attraction/river_rafting: + # attraction=river_rafting + name: River Rafting + # 'terms: theme park,aquatic park,water park,rafting simulator,river rafting ride,river rapids ride' + terms: '' + attraction/roller_coaster: + # attraction=roller_coaster + name: Roller Coaster + # 'terms: theme park,amusement ride' + terms: '' + attraction/train: + # attraction=train + name: Tourist Train + # 'terms: theme park,rackless train,road train,Tschu-Tschu train,dotto train,park train' + terms: '' + attraction/water_slide: + # attraction=water_slide + name: Water Slide + # 'terms: theme park,aquatic park,water park,flumes,water chutes,hydroslides' + terms: '' barrier: # barrier=* name: Barrier @@ -3556,6 +3626,7 @@ en: natural/wetland: # natural=wetland name: Wetland + # 'terms: bog,marsh,reedbed,swamp,tidalflat' terms: '' natural/wood: # natural=wood diff --git a/data/presets/fields.json b/data/presets/fields.json index e099f5416..1b6e8224d 100644 --- a/data/presets/fields.json +++ b/data/presets/fields.json @@ -1629,6 +1629,13 @@ "universal": true, "label": "Source" }, + "species": { + "key": "species", + "type": "localized", + "label": "Scientific Name", + "universal": true, + "placeholder": "Scientific name of the species" + }, "sport_ice": { "key": "sport", "type": "semiCombo", diff --git a/data/presets/fields/species.json b/data/presets/fields/species.json new file mode 100644 index 000000000..dcb010f51 --- /dev/null +++ b/data/presets/fields/species.json @@ -0,0 +1,7 @@ +{ + "key": "species", + "type": "localized", + "label": "Scientific Name", + "universal": true, + "placeholder": "Scientific name of the species" +} diff --git a/data/presets/presets.json b/data/presets/presets.json index 936001dd7..045b260c5 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -3317,6 +3317,295 @@ }, "name": "Road Surface" }, + "attraction/amusement_ride": { + "icon": "amusement-park", + "fields": [ + "name", + "operator", + "opening_hours" + ], + "geometry": [ + "point", + "area" + ], + "terms": [ + "theme park", + "carnival ride" + ], + "tags": { + "attraction": "amusement_ride" + }, + "name": "Amusement Ride" + }, + "attraction/animal": { + "icon": "zoo", + "fields": [ + "name", + "species", + "operator" + ], + "geometry": [ + "point", + "area" + ], + "terms": [ + "zoo", + "theme park", + "animal park", + "lion", + "tiger", + "bear" + ], + "tags": { + "attraction": "animal" + }, + "name": "Animal" + }, + "attraction/big_wheel": { + "icon": "amusement-park", + "fields": [ + "name", + "operator", + "opening_hours" + ], + "geometry": [ + "point" + ], + "terms": [ + "ferris wheel", + "theme park", + "amusement ride" + ], + "tags": { + "attraction": "big_wheel" + }, + "name": "Big Wheel" + }, + "attraction/bumper_car": { + "icon": "car", + "fields": [ + "name", + "operator", + "opening_hours" + ], + "geometry": [ + "point", + "area" + ], + "terms": [ + "theme park", + "dodgem cars", + "autoscooter" + ], + "tags": { + "attraction": "bumper_car" + }, + "name": "Bumper Car" + }, + "attraction/bungee_jumping": { + "icon": "pitch", + "fields": [ + "name", + "operator", + "opening_hours" + ], + "geometry": [ + "point", + "area" + ], + "terms": [ + "theme park", + "bungy jumping", + "jumping platform" + ], + "tags": { + "attraction": "bungee_jumping" + }, + "name": "Bungee Jumping" + }, + "attraction/carousel": { + "icon": "horse-riding", + "fields": [ + "name", + "operator", + "opening_hours" + ], + "geometry": [ + "point", + "area" + ], + "terms": [ + "theme park", + "roundabout", + "merry-go-round", + "galloper", + "jumper", + "horseabout", + "flying horses" + ], + "tags": { + "attraction": "carousel" + }, + "name": "Carousel" + }, + "attraction/dark_ride": { + "icon": "rail-metro", + "fields": [ + "name", + "operator", + "opening_hours" + ], + "geometry": [ + "point", + "line", + "area" + ], + "terms": [ + "theme park", + "ghost train" + ], + "tags": { + "attraction": "dark_ride" + }, + "name": "Dark Ride" + }, + "attraction/drop_tower": { + "icon": "poi-tower", + "fields": [ + "name", + "operator", + "height", + "opening_hours" + ], + "geometry": [ + "point", + "area" + ], + "terms": [ + "theme park", + "amusement ride", + "gondola", + "tower", + "big drop" + ], + "tags": { + "attraction": "drop_tower" + }, + "name": "Drop Tower" + }, + "attraction/pirate_ship": { + "icon": "amusement-park", + "fields": [ + "name", + "operator", + "opening_hours" + ], + "geometry": [ + "point" + ], + "terms": [ + "theme park", + "carnival ride", + "amusement ride" + ], + "tags": { + "attraction": "pirate_ship" + }, + "name": "Pirate Ship" + }, + "attraction/river_rafting": { + "icon": "ferry", + "fields": [ + "name", + "operator", + "opening_hours" + ], + "geometry": [ + "point", + "line" + ], + "terms": [ + "theme park", + "aquatic park", + "water park", + "rafting simulator", + "river rafting ride", + "river rapids ride" + ], + "tags": { + "attraction": "river_rafting" + }, + "name": "River Rafting" + }, + "attraction/roller_coaster": { + "icon": "amusement-park", + "fields": [ + "name", + "operator", + "opening_hours" + ], + "geometry": [ + "point", + "area" + ], + "terms": [ + "theme park", + "amusement ride" + ], + "tags": { + "attraction": "roller_coaster" + }, + "name": "Roller Coaster" + }, + "attraction/train": { + "icon": "rail", + "fields": [ + "name", + "operator", + "fee", + "opening_hours" + ], + "geometry": [ + "point", + "line" + ], + "terms": [ + "theme park", + "rackless train", + "road train", + "Tschu-Tschu train", + "dotto train", + "park train" + ], + "tags": { + "attraction": "train" + }, + "name": "Tourist Train" + }, + "attraction/water_slide": { + "icon": "swimming", + "fields": [ + "name", + "operator", + "opening_hours" + ], + "geometry": [ + "line", + "area" + ], + "terms": [ + "theme park", + "aquatic park", + "water park", + "flumes", + "water chutes", + "hydroslides" + ], + "tags": { + "attraction": "water_slide" + }, + "name": "Water Slide" + }, "barrier": { "icon": "roadblock", "geometry": [ @@ -9570,6 +9859,7 @@ "natural/tree": { "icon": "park", "fields": [ + "species", "leaf_type_singular", "leaf_cycle_singular", "denotation" @@ -9694,7 +9984,13 @@ "tags": { "natural": "wetland" }, - "terms": [], + "terms": [ + "bog", + "marsh", + "reedbed", + "swamp", + "tidalflat" + ], "name": "Wetland" }, "natural/wood": { diff --git a/data/presets/presets/attraction/amusement_ride.json b/data/presets/presets/attraction/amusement_ride.json new file mode 100644 index 000000000..52fbe5c7a --- /dev/null +++ b/data/presets/presets/attraction/amusement_ride.json @@ -0,0 +1,20 @@ +{ + "icon": "amusement-park", + "fields": [ + "name", + "operator", + "opening_hours" + ], + "geometry": [ + "point", + "area" + ], + "terms": [ + "theme park", + "carnival ride" + ], + "tags": { + "attraction": "amusement_ride" + }, + "name": "Amusement Ride" +} diff --git a/data/presets/presets/attraction/animal.json b/data/presets/presets/attraction/animal.json new file mode 100644 index 000000000..16baf27e8 --- /dev/null +++ b/data/presets/presets/attraction/animal.json @@ -0,0 +1,24 @@ +{ + "icon": "zoo", + "fields": [ + "name", + "species", + "operator" + ], + "geometry": [ + "point", + "area" + ], + "terms": [ + "zoo", + "theme park", + "animal park", + "lion", + "tiger", + "bear" + ], + "tags": { + "attraction": "animal" + }, + "name": "Animal" +} diff --git a/data/presets/presets/attraction/big_wheel.json b/data/presets/presets/attraction/big_wheel.json new file mode 100644 index 000000000..ff2c12261 --- /dev/null +++ b/data/presets/presets/attraction/big_wheel.json @@ -0,0 +1,20 @@ +{ + "icon": "amusement-park", + "fields": [ + "name", + "operator", + "opening_hours" + ], + "geometry": [ + "point" + ], + "terms": [ + "ferris wheel", + "theme park", + "amusement ride" + ], + "tags": { + "attraction": "big_wheel" + }, + "name": "Big Wheel" +} diff --git a/data/presets/presets/attraction/bumper_car.json b/data/presets/presets/attraction/bumper_car.json new file mode 100644 index 000000000..d96e75f1f --- /dev/null +++ b/data/presets/presets/attraction/bumper_car.json @@ -0,0 +1,21 @@ +{ + "icon": "car", + "fields": [ + "name", + "operator", + "opening_hours" + ], + "geometry": [ + "point", + "area" + ], + "terms": [ + "theme park", + "dodgem cars", + "autoscooter" + ], + "tags": { + "attraction": "bumper_car" + }, + "name": "Bumper Car" +} diff --git a/data/presets/presets/attraction/bungee_jumping.json b/data/presets/presets/attraction/bungee_jumping.json new file mode 100644 index 000000000..7e7f83b8c --- /dev/null +++ b/data/presets/presets/attraction/bungee_jumping.json @@ -0,0 +1,21 @@ +{ + "icon": "pitch", + "fields": [ + "name", + "operator", + "opening_hours" + ], + "geometry": [ + "point", + "area" + ], + "terms": [ + "theme park", + "bungy jumping", + "jumping platform" + ], + "tags": { + "attraction": "bungee_jumping" + }, + "name": "Bungee Jumping" +} diff --git a/data/presets/presets/attraction/carousel.json b/data/presets/presets/attraction/carousel.json new file mode 100644 index 000000000..3ae2ce844 --- /dev/null +++ b/data/presets/presets/attraction/carousel.json @@ -0,0 +1,25 @@ +{ + "icon": "horse-riding", + "fields": [ + "name", + "operator", + "opening_hours" + ], + "geometry": [ + "point", + "area" + ], + "terms": [ + "theme park", + "roundabout", + "merry-go-round", + "galloper", + "jumper", + "horseabout", + "flying horses" + ], + "tags": { + "attraction": "carousel" + }, + "name": "Carousel" +} diff --git a/data/presets/presets/attraction/dark_ride.json b/data/presets/presets/attraction/dark_ride.json new file mode 100644 index 000000000..bc0c9c02d --- /dev/null +++ b/data/presets/presets/attraction/dark_ride.json @@ -0,0 +1,21 @@ +{ + "icon": "rail-metro", + "fields": [ + "name", + "operator", + "opening_hours" + ], + "geometry": [ + "point", + "line", + "area" + ], + "terms": [ + "theme park", + "ghost train" + ], + "tags": { + "attraction": "dark_ride" + }, + "name": "Dark Ride" +} diff --git a/data/presets/presets/attraction/drop_tower.json b/data/presets/presets/attraction/drop_tower.json new file mode 100644 index 000000000..6e14a2eea --- /dev/null +++ b/data/presets/presets/attraction/drop_tower.json @@ -0,0 +1,24 @@ +{ + "icon": "poi-tower", + "fields": [ + "name", + "operator", + "height", + "opening_hours" + ], + "geometry": [ + "point", + "area" + ], + "terms": [ + "theme park", + "amusement ride", + "gondola", + "tower", + "big drop" + ], + "tags": { + "attraction": "drop_tower" + }, + "name": "Drop Tower" +} diff --git a/data/presets/presets/attraction/pirate_ship.json b/data/presets/presets/attraction/pirate_ship.json new file mode 100644 index 000000000..cb2edd425 --- /dev/null +++ b/data/presets/presets/attraction/pirate_ship.json @@ -0,0 +1,20 @@ +{ + "icon": "amusement-park", + "fields": [ + "name", + "operator", + "opening_hours" + ], + "geometry": [ + "point" + ], + "terms": [ + "theme park", + "carnival ride", + "amusement ride" + ], + "tags": { + "attraction": "pirate_ship" + }, + "name": "Pirate Ship" +} diff --git a/data/presets/presets/attraction/river_rafting.json b/data/presets/presets/attraction/river_rafting.json new file mode 100644 index 000000000..681ee1106 --- /dev/null +++ b/data/presets/presets/attraction/river_rafting.json @@ -0,0 +1,24 @@ +{ + "icon": "ferry", + "fields": [ + "name", + "operator", + "opening_hours" + ], + "geometry": [ + "point", + "line" + ], + "terms": [ + "theme park", + "aquatic park", + "water park", + "rafting simulator", + "river rafting ride", + "river rapids ride" + ], + "tags": { + "attraction": "river_rafting" + }, + "name": "River Rafting" +} diff --git a/data/presets/presets/attraction/roller_coaster.json b/data/presets/presets/attraction/roller_coaster.json new file mode 100644 index 000000000..74b75b5a6 --- /dev/null +++ b/data/presets/presets/attraction/roller_coaster.json @@ -0,0 +1,20 @@ +{ + "icon": "amusement-park", + "fields": [ + "name", + "operator", + "opening_hours" + ], + "geometry": [ + "point", + "area" + ], + "terms": [ + "theme park", + "amusement ride" + ], + "tags": { + "attraction": "roller_coaster" + }, + "name": "Roller Coaster" +} diff --git a/data/presets/presets/attraction/train.json b/data/presets/presets/attraction/train.json new file mode 100644 index 000000000..079699dc8 --- /dev/null +++ b/data/presets/presets/attraction/train.json @@ -0,0 +1,25 @@ +{ + "icon": "rail", + "fields": [ + "name", + "operator", + "fee", + "opening_hours" + ], + "geometry": [ + "point", + "line" + ], + "terms": [ + "theme park", + "rackless train", + "road train", + "Tschu-Tschu train", + "dotto train", + "park train" + ], + "tags": { + "attraction": "train" + }, + "name": "Tourist Train" +} diff --git a/data/presets/presets/attraction/water_slide.json b/data/presets/presets/attraction/water_slide.json new file mode 100644 index 000000000..692629753 --- /dev/null +++ b/data/presets/presets/attraction/water_slide.json @@ -0,0 +1,24 @@ +{ + "icon": "swimming", + "fields": [ + "name", + "operator", + "opening_hours" + ], + "geometry": [ + "line", + "area" + ], + "terms": [ + "theme park", + "aquatic park", + "water park", + "flumes", + "water chutes", + "hydroslides" + ], + "tags": { + "attraction": "water_slide" + }, + "name": "Water Slide" +} diff --git a/data/presets/presets/natural/tree.json b/data/presets/presets/natural/tree.json index a5066822a..e3fe5c5dd 100644 --- a/data/presets/presets/natural/tree.json +++ b/data/presets/presets/natural/tree.json @@ -1,6 +1,7 @@ { "icon": "park", "fields": [ + "species", "leaf_type_singular", "leaf_cycle_singular", "denotation" diff --git a/data/taginfo.json b/data/taginfo.json index 0dfc9f114..c262685d8 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -606,6 +606,58 @@ { "key": "area:highway" }, + { + "key": "attraction", + "value": "amusement_ride" + }, + { + "key": "attraction", + "value": "animal" + }, + { + "key": "attraction", + "value": "big_wheel" + }, + { + "key": "attraction", + "value": "bumper_car" + }, + { + "key": "attraction", + "value": "bungee_jumping" + }, + { + "key": "attraction", + "value": "carousel" + }, + { + "key": "attraction", + "value": "dark_ride" + }, + { + "key": "attraction", + "value": "drop_tower" + }, + { + "key": "attraction", + "value": "pirate_ship" + }, + { + "key": "attraction", + "value": "river_rafting" + }, + { + "key": "attraction", + "value": "roller_coaster" + }, + { + "key": "attraction", + "value": "train" + }, + { + "key": "attraction", + "value": "water_slide" + }, { "key": "barrier" }, diff --git a/dist/locales/en.json b/dist/locales/en.json index 2f4cfb3f9..e7271d1cc 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -2096,6 +2096,10 @@ "source": { "label": "Source" }, + "species": { + "label": "Scientific Name", + "placeholder": "Scientific name of the species" + }, "sport_ice": { "label": "Sports" }, @@ -2885,6 +2889,58 @@ "name": "Road Surface", "terms": "" }, + "attraction/amusement_ride": { + "name": "Amusement Ride", + "terms": "theme park,carnival ride" + }, + "attraction/animal": { + "name": "Animal", + "terms": "zoo,theme park,animal park,lion,tiger,bear" + }, + "attraction/big_wheel": { + "name": "Big Wheel", + "terms": "ferris wheel,theme park,amusement ride" + }, + "attraction/bumper_car": { + "name": "Bumper Car", + "terms": "theme park,dodgem cars,autoscooter" + }, + "attraction/bungee_jumping": { + "name": "Bungee Jumping", + "terms": "theme park,bungy jumping,jumping platform" + }, + "attraction/carousel": { + "name": "Carousel", + "terms": "theme park,roundabout,merry-go-round,galloper,jumper,horseabout,flying horses" + }, + "attraction/dark_ride": { + "name": "Dark Ride", + "terms": "theme park,ghost train" + }, + "attraction/drop_tower": { + "name": "Drop Tower", + "terms": "theme park,amusement ride,gondola,tower,big drop" + }, + "attraction/pirate_ship": { + "name": "Pirate Ship", + "terms": "theme park,carnival ride,amusement ride" + }, + "attraction/river_rafting": { + "name": "River Rafting", + "terms": "theme park,aquatic park,water park,rafting simulator,river rafting ride,river rapids ride" + }, + "attraction/roller_coaster": { + "name": "Roller Coaster", + "terms": "theme park,amusement ride" + }, + "attraction/train": { + "name": "Tourist Train", + "terms": "theme park,rackless train,road train,Tschu-Tschu train,dotto train,park train" + }, + "attraction/water_slide": { + "name": "Water Slide", + "terms": "theme park,aquatic park,water park,flumes,water chutes,hydroslides" + }, "barrier": { "name": "Barrier", "terms": "" @@ -4211,7 +4267,7 @@ }, "natural/wetland": { "name": "Wetland", - "terms": "" + "terms": "bog,marsh,reedbed,swamp,tidalflat" }, "natural/wood": { "name": "Wood", From ad4f66a1f404a3cec46be4a51d87a2b1520c300a Mon Sep 17 00:00:00 2001 From: Wille Marcel Date: Thu, 17 Aug 2017 16:55:33 -0300 Subject: [PATCH 02/20] add height field to big_wheel and bungee_jumping presets --- data/presets/presets.json | 2 ++ data/presets/presets/attraction/big_wheel.json | 1 + data/presets/presets/attraction/bungee_jumping.json | 1 + 3 files changed, 4 insertions(+) diff --git a/data/presets/presets.json b/data/presets/presets.json index 045b260c5..d29d606c0 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -3366,6 +3366,7 @@ "fields": [ "name", "operator", + "height", "opening_hours" ], "geometry": [ @@ -3407,6 +3408,7 @@ "fields": [ "name", "operator", + "height", "opening_hours" ], "geometry": [ diff --git a/data/presets/presets/attraction/big_wheel.json b/data/presets/presets/attraction/big_wheel.json index ff2c12261..b052f1c23 100644 --- a/data/presets/presets/attraction/big_wheel.json +++ b/data/presets/presets/attraction/big_wheel.json @@ -3,6 +3,7 @@ "fields": [ "name", "operator", + "height", "opening_hours" ], "geometry": [ diff --git a/data/presets/presets/attraction/bungee_jumping.json b/data/presets/presets/attraction/bungee_jumping.json index 7e7f83b8c..4604d2845 100644 --- a/data/presets/presets/attraction/bungee_jumping.json +++ b/data/presets/presets/attraction/bungee_jumping.json @@ -3,6 +3,7 @@ "fields": [ "name", "operator", + "height", "opening_hours" ], "geometry": [ From c370f3394fbdbaaaa4dbb45401ff2c5bb5267310 Mon Sep 17 00:00:00 2001 From: Wille Marcel Date: Thu, 17 Aug 2017 17:10:32 -0300 Subject: [PATCH 03/20] remove species field --- data/presets.yaml | 5 ----- data/presets/fields.json | 7 ------- data/presets/fields/species.json | 7 ------- data/presets/presets.json | 2 -- data/presets/presets/attraction/animal.json | 1 - data/presets/presets/natural/tree.json | 1 - dist/locales/en.json | 4 ---- 7 files changed, 27 deletions(-) delete mode 100644 data/presets/fields/species.json diff --git a/data/presets.yaml b/data/presets.yaml index f00b9e4ca..92da35746 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -1219,11 +1219,6 @@ en: source: # source=* label: Source - species: - # species=* - label: Scientific Name - # species field placeholder - placeholder: Scientific name of the species sport: # sport=* label: Sports diff --git a/data/presets/fields.json b/data/presets/fields.json index 1b6e8224d..e099f5416 100644 --- a/data/presets/fields.json +++ b/data/presets/fields.json @@ -1629,13 +1629,6 @@ "universal": true, "label": "Source" }, - "species": { - "key": "species", - "type": "localized", - "label": "Scientific Name", - "universal": true, - "placeholder": "Scientific name of the species" - }, "sport_ice": { "key": "sport", "type": "semiCombo", diff --git a/data/presets/fields/species.json b/data/presets/fields/species.json deleted file mode 100644 index dcb010f51..000000000 --- a/data/presets/fields/species.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "key": "species", - "type": "localized", - "label": "Scientific Name", - "universal": true, - "placeholder": "Scientific name of the species" -} diff --git a/data/presets/presets.json b/data/presets/presets.json index d29d606c0..681aed6ba 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -3341,7 +3341,6 @@ "icon": "zoo", "fields": [ "name", - "species", "operator" ], "geometry": [ @@ -9861,7 +9860,6 @@ "natural/tree": { "icon": "park", "fields": [ - "species", "leaf_type_singular", "leaf_cycle_singular", "denotation" diff --git a/data/presets/presets/attraction/animal.json b/data/presets/presets/attraction/animal.json index 16baf27e8..f9b36d663 100644 --- a/data/presets/presets/attraction/animal.json +++ b/data/presets/presets/attraction/animal.json @@ -2,7 +2,6 @@ "icon": "zoo", "fields": [ "name", - "species", "operator" ], "geometry": [ diff --git a/data/presets/presets/natural/tree.json b/data/presets/presets/natural/tree.json index e3fe5c5dd..a5066822a 100644 --- a/data/presets/presets/natural/tree.json +++ b/data/presets/presets/natural/tree.json @@ -1,7 +1,6 @@ { "icon": "park", "fields": [ - "species", "leaf_type_singular", "leaf_cycle_singular", "denotation" diff --git a/dist/locales/en.json b/dist/locales/en.json index e7271d1cc..0428b3b93 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -2096,10 +2096,6 @@ "source": { "label": "Source" }, - "species": { - "label": "Scientific Name", - "placeholder": "Scientific name of the species" - }, "sport_ice": { "label": "Sports" }, From 419781fc215b437656732d8fff36b223adc016cf Mon Sep 17 00:00:00 2001 From: JamesKingdom Date: Fri, 18 Aug 2017 17:44:17 +0100 Subject: [PATCH 04/20] Restore original vietnam addressing --- data/address-formats.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/address-formats.json b/data/address-formats.json index ea64be59e..6f701bd24 100644 --- a/data/address-formats.json +++ b/data/address-formats.json @@ -53,7 +53,7 @@ { "countryCodes": ["vn"], "format": [ - ["housenumber", "street","unit"], + ["housenumber", "street"], ["subdistrict"], ["district"], ["city"], From b4c42546e4d91c3371556924b7485337f4469e30 Mon Sep 17 00:00:00 2001 From: JamesKingdom Date: Sat, 19 Aug 2017 03:02:23 +0100 Subject: [PATCH 05/20] Updating installation steps for readme --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 26aa6f85e..251428a3d 100644 --- a/README.md +++ b/README.md @@ -49,7 +49,8 @@ This is only necessary the first time so that the build process can create symbo To run the current development version of iD on your own computer: 1. Create a local `git clone` of the project, then `cd` into the project folder -2. Run `npm install` (this will run the `prepublish` script that builds everything) +2. Run `npm install` +3. Run `npm run all` 3. Run `npm start` 4. Open `http://localhost:8080/` in a web browser From 49dc6395d78e41a63ad1ee76f2d5667b67aa070f Mon Sep 17 00:00:00 2001 From: JamesKingdom Date: Sat, 19 Aug 2017 03:03:03 +0100 Subject: [PATCH 06/20] Remove prepublish from package.json (closes #4246) --- package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/package.json b/package.json index e81347773..c0504c720 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,6 @@ "dist:svg:id": "node svg/spriteify.js --svg svg/iD-sprite.src.svg --json svg/iD-sprite.json > dist/img/iD-sprite.svg", "imagery": "node data/update_imagery", "lint": "eslint *.js js/id test/spec modules", - "prepublish": "npm run all", "start": "node development_server.js develop", "test": "npm-run-all -s lint build test:**", "test:phantom": "phantomjs --web-security=no node_modules/mocha-phantomjs-core/mocha-phantomjs-core.js test/index.html spec", From 165d93fdb8d3a74b1d8efacb2bfbc3a906f58e7e Mon Sep 17 00:00:00 2001 From: Bryan Housel Date: Fri, 18 Aug 2017 22:18:09 -0400 Subject: [PATCH 07/20] Tell travis to `npm run build` --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 2463156b2..e46f7d27c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,5 +4,7 @@ node_js: - "6" - "8" sudo: required +before_script: + - npm run all after_success: - ./scripts/txpush.sh From 8ed2d18474a9728d139f15846aed643e690da82f Mon Sep 17 00:00:00 2001 From: Bryan Housel Date: Fri, 18 Aug 2017 22:53:11 -0400 Subject: [PATCH 08/20] Apply imagary offset to projection before tiling background layer (closes #4232) --- modules/renderer/tile_layer.js | 57 +++++++++++++++++++++------------- 1 file changed, 35 insertions(+), 22 deletions(-) diff --git a/modules/renderer/tile_layer.js b/modules/renderer/tile_layer.js index 164dbba38..4a1735fa4 100644 --- a/modules/renderer/tile_layer.js +++ b/modules/renderer/tile_layer.js @@ -7,7 +7,7 @@ import { utilPrefixCSSProperty } from '../util'; export function rendererTileLayer(context) { var tileSize = 256, - tile = d3geoTile(), + geotile = d3geoTile(), projection, cache = {}, tileOrigin, @@ -40,7 +40,8 @@ export function rendererTileLayer(context) { return [ Math.floor(t[0] * power), Math.floor(t[1] * power), - t[2] + distance]; + t[2] + distance + ]; } @@ -74,14 +75,31 @@ export function rendererTileLayer(context) { // Update tiles based on current state of `projection`. function background(selection) { - tile.scale(projection.scale() * 2 * Math.PI) - .translate(projection.translate()); + z = Math.max(Math.log(projection.scale() * 2 * Math.PI) / Math.log(2) - 8, 0); + + var pixelOffset; + if (source) { + pixelOffset = [ + source.offset()[0] * Math.pow(2, z), + source.offset()[1] * Math.pow(2, z) + ]; + } else { + pixelOffset = [0, 0]; + } + + var translate = [ + projection.translate()[0] + pixelOffset[0], + projection.translate()[1] + pixelOffset[1] + ]; + + geotile + .scale(projection.scale() * 2 * Math.PI) + .translate(translate); tileOrigin = [ - projection.scale() * Math.PI - projection.translate()[0], - projection.scale() * Math.PI - projection.translate()[1]]; - - z = Math.max(Math.log(projection.scale() * 2 * Math.PI) / Math.log(2) - 8, 0); + projection.scale() * Math.PI - translate[0], + projection.scale() * Math.PI - translate[1] + ]; render(selection); } @@ -96,7 +114,7 @@ export function rendererTileLayer(context) { var showDebug = context.getDebug('tile') && !source.overlay; if (source.validZoom(z)) { - tile().forEach(function(d) { + geotile().forEach(function(d) { addSource(d); if (d[3] === '') return; if (typeof d[3] !== 'string') return; // Workaround for #2295 @@ -115,11 +133,6 @@ export function rendererTileLayer(context) { }); } - var pixelOffset = [ - source.offset()[0] * Math.pow(2, z), - source.offset()[1] * Math.pow(2, z) - ]; - function load(d) { cache[d[3]] = true; @@ -143,16 +156,16 @@ export function rendererTileLayer(context) { var _ts = tileSize * Math.pow(2, z - d[2]); var scale = tileSizeAtZoom(d, z); return 'translate(' + - ((d[0] * _ts) - tileOrigin[0] + pixelOffset[0]) + 'px,' + - ((d[1] * _ts) - tileOrigin[1] + pixelOffset[1]) + 'px)' + + ((d[0] * _ts) - tileOrigin[0]) + 'px,' + + ((d[1] * _ts) - tileOrigin[1]) + 'px) ' + 'scale(' + scale + ',' + scale + ')'; } function tileCenter(d) { var _ts = tileSize * Math.pow(2, z - d[2]); return [ - ((d[0] * _ts) - tileOrigin[0] + pixelOffset[0] + (_ts / 2)), - ((d[1] * _ts) - tileOrigin[1] + pixelOffset[1] + (_ts / 2)) + ((d[0] * _ts) - tileOrigin[0] + (_ts / 2)), + ((d[1] * _ts) - tileOrigin[1] + (_ts / 2)) ]; } @@ -164,7 +177,7 @@ export function rendererTileLayer(context) { // Pick a representative tile near the center of the viewport // (This is useful for sampling the imagery vintage) - var dims = tile.size(), + var dims = geotile.size(), mapCenter = [dims[0] / 2, dims[1] / 2], minDist = Math.max(dims[0], dims[1]), nearCenter; @@ -261,8 +274,8 @@ export function rendererTileLayer(context) { background.dimensions = function(_) { - if (!arguments.length) return tile.size(); - tile.size(_); + if (!arguments.length) return geotile.size(); + geotile.size(_); return background; }; @@ -271,7 +284,7 @@ export function rendererTileLayer(context) { if (!arguments.length) return source; source = _; cache = {}; - tile.scaleExtent(source.scaleExtent); + geotile.scaleExtent(source.scaleExtent); return background; }; From 6649b2ec72c33ffdfcda7f8870436986f1e5ef76 Mon Sep 17 00:00:00 2001 From: Stenive Date: Sat, 19 Aug 2017 20:30:55 +0800 Subject: [PATCH 09/20] Update Chinese address format --- data/address-formats.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/data/address-formats.json b/data/address-formats.json index 6f701bd24..e17b00877 100644 --- a/data/address-formats.json +++ b/data/address-formats.json @@ -122,8 +122,7 @@ "countryCodes": ["cn"], "format": [ ["postcode", "province"], - ["city", "unit"], - ["district"], + ["city", "district"], ["street", "housenumber"] ] } From ee2221ccca57d29f78b7e6cfe398615ab0c0a89f Mon Sep 17 00:00:00 2001 From: JamesKingdom Date: Sun, 20 Aug 2017 03:19:13 +0100 Subject: [PATCH 10/20] Updating clone information on readme (closes #4249) --- README.md | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 251428a3d..70a0cef23 100644 --- a/README.md +++ b/README.md @@ -48,7 +48,24 @@ This is only necessary the first time so that the build process can create symbo To run the current development version of iD on your own computer: -1. Create a local `git clone` of the project, then `cd` into the project folder +#### Cloning the repository + +The repository is reasonably large. and it's unlikely that you need the full history. If you are happy to wait for it all to download, run: + +``` +git clone https://github.com/openstreetmap/iD.git +``` + +To clone only the most recent version, instead use a 'shallow clone': + +``` +git clone --depth=1 https://github.com/openstreetmap/iD.git +``` + +If you want to add in the full history later on, perhaps to run `git blame` or `git log`, run `git fetch --depth=1000000` + +#### Building iD +1. `cd` into the newly cloned project folder 2. Run `npm install` 3. Run `npm run all` 3. Run `npm start` From 973a711163944b19c9e020a5ee9d69f630c5ad0e Mon Sep 17 00:00:00 2001 From: JamesKingdom Date: Sun, 20 Aug 2017 03:45:41 +0100 Subject: [PATCH 11/20] Allow traffic mirror on vertex (closes 4250) --- data/presets/presets.json | 3 ++- data/presets/presets/highway/traffic_mirror.json | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/data/presets/presets.json b/data/presets/presets.json index 681aed6ba..bf07a197b 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -6878,7 +6878,8 @@ }, "highway/traffic_mirror": { "geometry": [ - "point" + "point", + "vertex" ], "tags": { "highway": "traffic_mirror" diff --git a/data/presets/presets/highway/traffic_mirror.json b/data/presets/presets/highway/traffic_mirror.json index 358b13878..29ca4d78f 100644 --- a/data/presets/presets/highway/traffic_mirror.json +++ b/data/presets/presets/highway/traffic_mirror.json @@ -1,6 +1,7 @@ { "geometry": [ - "point" + "point", + "vertex" ], "tags": { "highway": "traffic_mirror" From 82f95f850fa9200bcda73cf00f711375ef79d87e Mon Sep 17 00:00:00 2001 From: JamesKingdom Date: Sun, 20 Aug 2017 04:15:33 +0100 Subject: [PATCH 12/20] Add life ring preset (closes #4251) --- data/presets.yaml | 5 +++++ data/presets/presets.json | 21 +++++++++++++++++++ data/presets/presets/emergency/life_ring.json | 21 +++++++++++++++++++ data/taginfo.json | 4 ++++ dist/locales/en.json | 4 ++++ 5 files changed, 55 insertions(+) create mode 100644 data/presets/presets/emergency/life_ring.json diff --git a/data/presets.yaml b/data/presets.yaml index 6b3605dc7..03ce23fac 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -2645,6 +2645,11 @@ en: name: Fire Hydrant # 'terms: fire plug' terms: '' + emergency/life_ring: + # emergency=life_ring + name: Life Ring + # 'terms: life buoy,kisby ring,kisbie ring,perry buoy' + terms: '' emergency/no: # emergency=no name: Emergency Access No diff --git a/data/presets/presets.json b/data/presets/presets.json index bf07a197b..201ce5664 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -5670,6 +5670,27 @@ }, "name": "Fire Hydrant" }, + "emergency/life_ring": { + "icon": "circle-stroked", + "fields": [ + "ref", + "operator" + ], + "geometry": [ + "point", + "vertex" + ], + "terms": [ + "life buoy", + "kisby ring", + "kisbie ring", + "perry buoy" + ], + "tags": { + "emergency": "life_ring" + }, + "name": "Life Ring" + }, "emergency/phone": { "icon": "emergency-phone", "fields": [ diff --git a/data/presets/presets/emergency/life_ring.json b/data/presets/presets/emergency/life_ring.json new file mode 100644 index 000000000..70895c97e --- /dev/null +++ b/data/presets/presets/emergency/life_ring.json @@ -0,0 +1,21 @@ +{ + "icon": "circle-stroked", + "fields": [ + "ref", + "operator" + ], + "geometry": [ + "point", + "vertex" + ], + "terms": [ + "life buoy", + "kisby ring", + "kisbie ring", + "perry buoy" + ], + "tags": { + "emergency": "life_ring" + }, + "name": "Life Ring" +} diff --git a/data/taginfo.json b/data/taginfo.json index c262685d8..ed37f6100 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -1118,6 +1118,10 @@ "key": "emergency", "value": "fire_hydrant" }, + { + "key": "emergency", + "value": "life_ring" + }, { "key": "emergency", "value": "phone" diff --git a/dist/locales/en.json b/dist/locales/en.json index d4b823f4f..b81fc30f0 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -3409,6 +3409,10 @@ "name": "Fire Hydrant", "terms": "fire plug" }, + "emergency/life_ring": { + "name": "Life Ring", + "terms": "life buoy,kisby ring,kisbie ring,perry buoy" + }, "emergency/phone": { "name": "Emergency Phone", "terms": "" From d667ee6e8946a317746dbe3f83d9bae699bfc14f Mon Sep 17 00:00:00 2001 From: Bryan Housel Date: Sun, 20 Aug 2017 12:14:38 -0400 Subject: [PATCH 13/20] Clear history immediately when switching sources --- modules/ui/source_switch.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/modules/ui/source_switch.js b/modules/ui/source_switch.js index 3a534bec0..5b6af31c9 100644 --- a/modules/ui/source_switch.js +++ b/modules/ui/source_switch.js @@ -16,9 +16,8 @@ export function uiSourceSwitch(context) { var live = d3.select(this) .classed('live'); - context.connection() - .switch(live ? keys[1] : keys[0]); - + context.history().clearSaved(); + context.connection().switch(live ? keys[1] : keys[0]); context.enter(modeBrowse(context)); context.flush(); From 69e42018692d7516a7c9bc22cbe073a57e816fb1 Mon Sep 17 00:00:00 2001 From: M1dgard Date: Mon, 21 Aug 2017 17:47:07 +0200 Subject: [PATCH 14/20] Make office=physician non-searchable and add term "physician" to amenity=doctors. --- data/presets.yaml | 3 +- data/presets/presets.json | 41 ++++++++++--------- data/presets/presets/amenity/doctors.json | 3 +- .../{physician.json => _physician.json} | 2 +- data/taginfo.json | 8 ++-- 5 files changed, 29 insertions(+), 28 deletions(-) rename data/presets/presets/office/{physician.json => _physician.json} (91%) diff --git a/data/presets.yaml b/data/presets.yaml index 03ce23fac..fe8feb3a1 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -1707,7 +1707,7 @@ en: amenity/doctors: # amenity=doctors name: Doctor - # 'terms: medic*' + # 'terms: medic*,physician' terms: '' amenity/dojo: # amenity=dojo @@ -3728,7 +3728,6 @@ en: office/physician: # office=physician name: Physician - terms: '' office/political_party: # office=political_party name: Political Party diff --git a/data/presets/presets.json b/data/presets/presets.json index 201ce5664..0ee468d58 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -1316,7 +1316,8 @@ "area" ], "terms": [ - "medic*" + "medic*", + "physician" ], "tags": { "amenity": "doctors" @@ -10073,6 +10074,25 @@ "terms": [], "name": "Office" }, + "office/physician": { + "icon": "commercial", + "fields": [ + "name", + "address", + "building_area", + "opening_hours" + ], + "geometry": [ + "point", + "vertex", + "area" + ], + "tags": { + "office": "physician" + }, + "searchable": false, + "name": "Physician" + }, "office/travel_agent": { "icon": "suitcase", "fields": [ @@ -10455,25 +10475,6 @@ "terms": [], "name": "NGO Office" }, - "office/physician": { - "icon": "commercial", - "fields": [ - "name", - "address", - "building_area", - "opening_hours" - ], - "geometry": [ - "point", - "vertex", - "area" - ], - "tags": { - "office": "physician" - }, - "terms": [], - "name": "Physician" - }, "office/political_party": { "icon": "commercial", "fields": [ diff --git a/data/presets/presets/amenity/doctors.json b/data/presets/presets/amenity/doctors.json index 2a765a01d..4d0c422e3 100644 --- a/data/presets/presets/amenity/doctors.json +++ b/data/presets/presets/amenity/doctors.json @@ -11,7 +11,8 @@ "area" ], "terms": [ - "medic*" + "medic*", + "physician" ], "tags": { "amenity": "doctors" diff --git a/data/presets/presets/office/physician.json b/data/presets/presets/office/_physician.json similarity index 91% rename from data/presets/presets/office/physician.json rename to data/presets/presets/office/_physician.json index 3fac3e38c..42113ef36 100644 --- a/data/presets/presets/office/physician.json +++ b/data/presets/presets/office/_physician.json @@ -14,6 +14,6 @@ "tags": { "office": "physician" }, - "terms": [], + "searchable": false, "name": "Physician" } diff --git a/data/taginfo.json b/data/taginfo.json index ed37f6100..529d71f73 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -1986,6 +1986,10 @@ { "key": "office" }, + { + "key": "office", + "value": "physician" + }, { "key": "office", "value": "travel_agent" @@ -2058,10 +2062,6 @@ "key": "office", "value": "ngo" }, - { - "key": "office", - "value": "physician" - }, { "key": "office", "value": "political_party" From 1270e80c47245414e06ee04dd83eaf8448dbb656 Mon Sep 17 00:00:00 2001 From: JamesKingdom Date: Mon, 21 Aug 2017 21:52:52 +0100 Subject: [PATCH 15/20] Adding shower preset (closes #4256) --- data/presets.yaml | 5 +++++ data/presets/presets.json | 22 ++++++++++++++++++++++ data/presets/presets/amenity/shower.json | 22 ++++++++++++++++++++++ data/taginfo.json | 4 ++++ dist/locales/en.json | 4 ++++ 5 files changed, 57 insertions(+) create mode 100644 data/presets/presets/amenity/shower.json diff --git a/data/presets.yaml b/data/presets.yaml index 03ce23fac..b1115f5bc 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -1958,6 +1958,11 @@ en: name: Shelter # 'terms: lean-to,gazebo,picnic' terms: '' + amenity/shower: + # amenity=shower + name: Shower + # 'terms: gelato' + terms: '' amenity/social_facility: # amenity=social_facility name: Social Facility diff --git a/data/presets/presets.json b/data/presets/presets.json index 201ce5664..d3f401180 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -2565,6 +2565,28 @@ }, "name": "Shelter" }, + "amenity/shower": { + "icon": "water", + "fields": [ + "operator", + "opening_hours", + "fee", + "supervised", + "building_area" + ], + "geometry": [ + "point", + "vertex", + "area" + ], + "terms": [ + "gelato" + ], + "tags": { + "amenity": "shower" + }, + "name": "Shower" + }, "amenity/social_facility": { "icon": "poi-social-facility", "fields": [ diff --git a/data/presets/presets/amenity/shower.json b/data/presets/presets/amenity/shower.json new file mode 100644 index 000000000..d23919903 --- /dev/null +++ b/data/presets/presets/amenity/shower.json @@ -0,0 +1,22 @@ +{ + "icon": "water", + "fields": [ + "operator", + "opening_hours", + "fee", + "supervised", + "building_area" + ], + "geometry": [ + "point", + "vertex", + "area" + ], + "terms": [ + "gelato" + ], + "tags": { + "amenity": "shower" + }, + "name": "Shower" +} diff --git a/data/taginfo.json b/data/taginfo.json index ed37f6100..b7b3e871f 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -479,6 +479,10 @@ "key": "amenity", "value": "shelter" }, + { + "key": "amenity", + "value": "shower" + }, { "key": "amenity", "value": "social_facility" diff --git a/dist/locales/en.json b/dist/locales/en.json index b81fc30f0..55b85d35f 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -2765,6 +2765,10 @@ "name": "Shelter", "terms": "lean-to,gazebo,picnic" }, + "amenity/shower": { + "name": "Shower", + "terms": "gelato" + }, "amenity/social_facility": { "name": "Social Facility", "terms": "" From 721acddaa8ef5db5253037f119c738f129444c50 Mon Sep 17 00:00:00 2001 From: JamesKingdom Date: Mon, 21 Aug 2017 22:02:25 +0100 Subject: [PATCH 16/20] Update a term for shower --- data/presets/presets/amenity/shower.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/presets/presets/amenity/shower.json b/data/presets/presets/amenity/shower.json index d23919903..1d5fcbe89 100644 --- a/data/presets/presets/amenity/shower.json +++ b/data/presets/presets/amenity/shower.json @@ -13,7 +13,7 @@ "area" ], "terms": [ - "gelato" + "rain closet" ], "tags": { "amenity": "shower" From 99ad38380eb396302d57d163676af63eb088d05f Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Tue, 22 Aug 2017 12:54:22 +0000 Subject: [PATCH 17/20] chore(package): update rollup-plugin-commonjs to version 8.1.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c0504c720..8a66f7f5e 100644 --- a/package.json +++ b/package.json @@ -59,7 +59,7 @@ "phantomjs-prebuilt": "~2.1.11", "request": "^2.81.0", "rollup": "0.45.2", - "rollup-plugin-commonjs": "8.1.0", + "rollup-plugin-commonjs": "8.1.1", "rollup-plugin-json": "2.2.0", "rollup-plugin-node-resolve": "3.0.0", "shelljs": "^0.7.5", From d4a5db511c3ebe7e06277f977204f9169c2ebeb3 Mon Sep 17 00:00:00 2001 From: JamesKingdom Date: Wed, 23 Aug 2017 00:04:26 +0100 Subject: [PATCH 18/20] Remove maxspeed field from living street (closes #4260) --- data/presets.yaml | 2 +- data/presets/presets.json | 3 +-- data/presets/presets/highway/living_street.json | 1 - dist/locales/en.json | 12 ++++++------ 4 files changed, 8 insertions(+), 10 deletions(-) diff --git a/data/presets.yaml b/data/presets.yaml index 67c13ffe0..f710a6199 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -1961,7 +1961,7 @@ en: amenity/shower: # amenity=shower name: Shower - # 'terms: gelato' + # 'terms: rain closet' terms: '' amenity/social_facility: # amenity=social_facility diff --git a/data/presets/presets.json b/data/presets/presets.json index 87907968d..6c567ea69 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -2581,7 +2581,7 @@ "area" ], "terms": [ - "gelato" + "rain closet" ], "tags": { "amenity": "shower" @@ -6230,7 +6230,6 @@ "fields": [ "name", "oneway", - "maxspeed", "lanes", "surface", "structure", diff --git a/data/presets/presets/highway/living_street.json b/data/presets/presets/highway/living_street.json index 52f78ce74..d02655625 100644 --- a/data/presets/presets/highway/living_street.json +++ b/data/presets/presets/highway/living_street.json @@ -3,7 +3,6 @@ "fields": [ "name", "oneway", - "maxspeed", "lanes", "surface", "structure", diff --git a/dist/locales/en.json b/dist/locales/en.json index 55b85d35f..a5259e55b 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -2559,7 +2559,7 @@ }, "amenity/doctors": { "name": "Doctor", - "terms": "medic*" + "terms": "medic*,physician" }, "amenity/dojo": { "name": "Dojo / Martial Arts Academy", @@ -2767,7 +2767,7 @@ }, "amenity/shower": { "name": "Shower", - "terms": "gelato" + "terms": "rain closet" }, "amenity/social_facility": { "name": "Social Facility", @@ -4293,6 +4293,10 @@ "name": "Office", "terms": "" }, + "office/physician": { + "name": "Physician", + "terms": "" + }, "office/travel_agent": { "name": "Travel Agency", "terms": "" @@ -4365,10 +4369,6 @@ "name": "NGO Office", "terms": "" }, - "office/physician": { - "name": "Physician", - "terms": "" - }, "office/political_party": { "name": "Political Party", "terms": "" From 575a5c2bf47e26f80e6854f7a071c36e856443dc Mon Sep 17 00:00:00 2001 From: Bryan Housel Date: Tue, 22 Aug 2017 19:28:20 -0400 Subject: [PATCH 19/20] Upgrade to sinon 3.2.1, sinon-chai 2.13.0 (closes #4213) --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 8a66f7f5e..69bb34b2c 100644 --- a/package.json +++ b/package.json @@ -64,8 +64,8 @@ "rollup-plugin-node-resolve": "3.0.0", "shelljs": "^0.7.5", "shx": "^0.2.1", - "sinon": "^2.3.0", - "sinon-chai": "^2.12.0", + "sinon": "^3.2.1", + "sinon-chai": "^2.13.0", "smash": "0.0", "svg-sprite": "1.3.7", "uglify-js": "^3.0.0", From 0830d04ff617d67c3752a47364c5e2bc0b5754d3 Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Wed, 23 Aug 2017 00:24:09 +0000 Subject: [PATCH 20/20] fix(package): update @mapbox/sexagesimal to version 1.1.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 69bb34b2c..0d4942b43 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,7 @@ "marked": "0.3.6", "osm-auth": "1.0.2", "rbush": "2.0.1", - "@mapbox/sexagesimal": "1.0.0", + "@mapbox/sexagesimal": "1.1.0", "@mapbox/togeojson": "0.16.0", "wmf-sitematrix": "0.1.4" },