From 5e0b5b1045db667148de831a29809c4b49192582 Mon Sep 17 00:00:00 2001 From: greenkeeperio-bot Date: Thu, 16 Mar 2017 00:55:54 -0400 Subject: [PATCH 01/11] chore(package): update rollup to version 0.41.6 https://greenkeeper.io/ --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ab68cf283..f4d302fe0 100644 --- a/package.json +++ b/package.json @@ -59,7 +59,7 @@ "npm-run-all": "~4.0.0", "phantomjs-prebuilt": "~2.1.11", "request": "~2.81.0", - "rollup": "0.41.5", + "rollup": "0.41.6", "rollup-plugin-commonjs": "8.0.2", "rollup-plugin-json": "2.0.2", "rollup-plugin-node-resolve": "2.0.0", From 7f0a73817d7ad2b6bd604cb2b27c24e405ea3aa0 Mon Sep 17 00:00:00 2001 From: Bryan Housel Date: Thu, 16 Mar 2017 10:12:31 -0400 Subject: [PATCH 02/11] Add preset for leisure=pitch+sport=equestrian (closes #3833) --- data/presets.yaml | 5 ++++ data/presets/presets.json | 24 +++++++++++++++++++ .../presets/leisure/pitch/equestrian.json | 24 +++++++++++++++++++ data/taginfo.json | 4 ++++ dist/locales/en.json | 4 ++++ 5 files changed, 61 insertions(+) create mode 100644 data/presets/presets/leisure/pitch/equestrian.json diff --git a/data/presets.yaml b/data/presets.yaml index 295c52ba3..844ba8f80 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -3017,6 +3017,11 @@ en: # 'leisure=pitch, sport=cricket' name: Cricket Field terms: '' + leisure/pitch/equestrian: + # 'leisure=pitch, sport=equestrian' + name: Riding Arena + # 'terms: dressage,equestrian,horse,horseback,riding' + terms: '' leisure/pitch/rugby_league: # 'leisure=pitch, sport=rugby_league' name: Rugby League Field diff --git a/data/presets/presets.json b/data/presets/presets.json index 197947627..e5925a088 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -7253,6 +7253,30 @@ "terms": [], "name": "Cricket Field" }, + "leisure/pitch/equestrian": { + "icon": "horse-riding", + "fields": [ + "surface", + "lit", + "building" + ], + "geometry": [ + "point", + "area" + ], + "tags": { + "leisure": "pitch", + "sport": "equestrian" + }, + "terms": [ + "dressage", + "equestrian", + "horse", + "horseback", + "riding" + ], + "name": "Riding Arena" + }, "leisure/pitch/rugby_league": { "icon": "america-football", "fields": [ diff --git a/data/presets/presets/leisure/pitch/equestrian.json b/data/presets/presets/leisure/pitch/equestrian.json new file mode 100644 index 000000000..fc01be3a1 --- /dev/null +++ b/data/presets/presets/leisure/pitch/equestrian.json @@ -0,0 +1,24 @@ +{ + "icon": "horse-riding", + "fields": [ + "surface", + "lit", + "building" + ], + "geometry": [ + "point", + "area" + ], + "tags": { + "leisure": "pitch", + "sport": "equestrian" + }, + "terms": [ + "dressage", + "equestrian", + "horse", + "horseback", + "riding" + ], + "name": "Riding Arena" +} diff --git a/data/taginfo.json b/data/taginfo.json index e798291ea..6b10f2c92 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -1543,6 +1543,10 @@ "key": "sport", "value": "cricket" }, + { + "key": "sport", + "value": "equestrian" + }, { "key": "sport", "value": "rugby_league" diff --git a/dist/locales/en.json b/dist/locales/en.json index 4b8d724fa..782e19b61 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -3408,6 +3408,10 @@ "name": "Cricket Field", "terms": "" }, + "leisure/pitch/equestrian": { + "name": "Riding Arena", + "terms": "dressage,equestrian,horse,horseback,riding" + }, "leisure/pitch/rugby_league": { "name": "Rugby League Field", "terms": "" From 0698efbcfe332c1ea2c58b37641454cbd36ff028 Mon Sep 17 00:00:00 2001 From: Bryan Housel Date: Thu, 16 Mar 2017 10:54:56 -0400 Subject: [PATCH 03/11] Add presets for shop=gas, shop=perfumery (re: #3651) --- data/presets.yaml | 9 +++++ data/presets/presets.json | 42 ++++++++++++++++++++++++ data/presets/presets/shop/gas.json | 25 ++++++++++++++ data/presets/presets/shop/perfumery.json | 17 ++++++++++ data/taginfo.json | 8 +++++ dist/locales/en.json | 8 +++++ 6 files changed, 109 insertions(+) create mode 100644 data/presets/presets/shop/gas.json create mode 100644 data/presets/presets/shop/perfumery.json diff --git a/data/presets.yaml b/data/presets.yaml index 844ba8f80..c4662dff6 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -3885,6 +3885,11 @@ en: name: Garden Center # 'terms: landscape,mulch,shrub,tree' terms: '' + shop/gas: + # shop=gas + name: Bottled Gas Shop + # 'terms: cng,lpg,natural gas,propane,refill,tank' + terms: '' shop/gift: # shop=gift name: Gift Shop @@ -4027,6 +4032,10 @@ en: # shop=pawnbroker name: Pawn Shop terms: '' + shop/perfumery: + # shop=perfumery + name: Perfume Store + terms: '' shop/pet: # shop=pet name: Pet Store diff --git a/data/presets/presets.json b/data/presets/presets.json index e5925a088..6fa281f5c 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -10672,6 +10672,31 @@ }, "name": "Garden Center" }, + "shop/gas": { + "icon": "shop", + "fields": [ + "operator", + "address", + "building_area", + "opening_hours" + ], + "geometry": [ + "point", + "area" + ], + "terms": [ + "cng", + "lpg", + "natural gas", + "propane", + "refill", + "tank" + ], + "tags": { + "shop": "gas" + }, + "name": "Bottled Gas Shop" + }, "shop/gift": { "icon": "gift", "fields": [ @@ -11272,6 +11297,23 @@ }, "name": "Pawn Shop" }, + "shop/perfumery": { + "icon": "shop", + "fields": [ + "operator", + "address", + "building_area", + "opening_hours" + ], + "geometry": [ + "point", + "area" + ], + "tags": { + "shop": "perfumery" + }, + "name": "Perfume Store" + }, "shop/pet": { "icon": "dog-park", "fields": [ diff --git a/data/presets/presets/shop/gas.json b/data/presets/presets/shop/gas.json new file mode 100644 index 000000000..f7d8eb032 --- /dev/null +++ b/data/presets/presets/shop/gas.json @@ -0,0 +1,25 @@ +{ + "icon": "shop", + "fields": [ + "operator", + "address", + "building_area", + "opening_hours" + ], + "geometry": [ + "point", + "area" + ], + "terms": [ + "cng", + "lpg", + "natural gas", + "propane", + "refill", + "tank" + ], + "tags": { + "shop": "gas" + }, + "name": "Bottled Gas Shop" +} diff --git a/data/presets/presets/shop/perfumery.json b/data/presets/presets/shop/perfumery.json new file mode 100644 index 000000000..e35a19dec --- /dev/null +++ b/data/presets/presets/shop/perfumery.json @@ -0,0 +1,17 @@ +{ + "icon": "shop", + "fields": [ + "operator", + "address", + "building_area", + "opening_hours" + ], + "geometry": [ + "point", + "area" + ], + "tags": { + "shop": "perfumery" + }, + "name": "Perfume Store" +} diff --git a/data/taginfo.json b/data/taginfo.json index 6b10f2c92..153eaf803 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -2310,6 +2310,10 @@ "key": "shop", "value": "garden_centre" }, + { + "key": "shop", + "value": "gas" + }, { "key": "shop", "value": "gift" @@ -2438,6 +2442,10 @@ "key": "shop", "value": "pawnbroker" }, + { + "key": "shop", + "value": "perfumery" + }, { "key": "shop", "value": "pet" diff --git a/dist/locales/en.json b/dist/locales/en.json index 782e19b61..38cbb9472 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -4192,6 +4192,10 @@ "name": "Garden Center", "terms": "landscape,mulch,shrub,tree" }, + "shop/gas": { + "name": "Bottled Gas Shop", + "terms": "cng,lpg,natural gas,propane,refill,tank" + }, "shop/gift": { "name": "Gift Shop", "terms": "souvenir" @@ -4320,6 +4324,10 @@ "name": "Pawn Shop", "terms": "" }, + "shop/perfumery": { + "name": "Perfume Store", + "terms": "" + }, "shop/pet": { "name": "Pet Store", "terms": "cat,dog,fish" From 974cb9ce2cff2ac4edff2ec213728252e8942717 Mon Sep 17 00:00:00 2001 From: Bryan Housel Date: Thu, 16 Mar 2017 12:48:01 -0400 Subject: [PATCH 04/11] Add preset for amenity=driving_school (re: #3651) --- data/presets.yaml | 4 ++++ data/presets/presets.json | 17 +++++++++++++++++ .../presets/presets/amenity/driving_school.json | 17 +++++++++++++++++ data/taginfo.json | 4 ++++ dist/locales/en.json | 4 ++++ 5 files changed, 46 insertions(+) create mode 100644 data/presets/presets/amenity/driving_school.json diff --git a/data/presets.yaml b/data/presets.yaml index c4662dff6..e4499fb73 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -1589,6 +1589,10 @@ en: name: Drinking Water # 'terms: fountain,potable' terms: '' + amenity/driving_school: + # amenity=driving_school + name: Driving School + terms: '' amenity/embassy: # amenity=embassy name: Embassy diff --git a/data/presets/presets.json b/data/presets/presets.json index 6fa281f5c..f6c82278c 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -1201,6 +1201,23 @@ ], "name": "Drinking Water" }, + "amenity/driving_school": { + "icon": "car", + "fields": [ + "operator", + "address", + "building_area", + "opening_hours" + ], + "geometry": [ + "point", + "area" + ], + "tags": { + "amenity": "driving_school" + }, + "name": "Driving School" + }, "amenity/embassy": { "icon": "embassy", "fields": [ diff --git a/data/presets/presets/amenity/driving_school.json b/data/presets/presets/amenity/driving_school.json new file mode 100644 index 000000000..7b709e73d --- /dev/null +++ b/data/presets/presets/amenity/driving_school.json @@ -0,0 +1,17 @@ +{ + "icon": "car", + "fields": [ + "operator", + "address", + "building_area", + "opening_hours" + ], + "geometry": [ + "point", + "area" + ], + "tags": { + "amenity": "driving_school" + }, + "name": "Driving School" +} diff --git a/data/taginfo.json b/data/taginfo.json index 153eaf803..fa7e5f33d 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -271,6 +271,10 @@ "key": "amenity", "value": "drinking_water" }, + { + "key": "amenity", + "value": "driving_school" + }, { "key": "amenity", "value": "embassy" diff --git a/dist/locales/en.json b/dist/locales/en.json index 38cbb9472..e3e9f877d 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -2128,6 +2128,10 @@ "name": "Drinking Water", "terms": "fountain,potable" }, + "amenity/driving_school": { + "name": "Driving School", + "terms": "" + }, "amenity/embassy": { "name": "Embassy", "terms": "" From b833bd2c8895b85608d3d49df19e4af9a0d6607f Mon Sep 17 00:00:00 2001 From: Bryan Housel Date: Thu, 16 Mar 2017 13:25:39 -0400 Subject: [PATCH 05/11] Add presets for Animal Boarding, Animal Breeding, Animal Shelter (re: #3651) --- data/presets.yaml | 17 +++- data/presets/presets.json | 98 ++++++++++++++++++- .../presets/amenity/animal_boarding.json | 29 ++++++ .../presets/amenity/animal_breeding.json | 31 ++++++ .../presets/amenity/animal_shelter.json | 32 ++++++ data/presets/presets/shop/pet.json | 6 +- data/taginfo.json | 12 +++ dist/locales/en.json | 14 ++- 8 files changed, 235 insertions(+), 4 deletions(-) create mode 100644 data/presets/presets/amenity/animal_boarding.json create mode 100644 data/presets/presets/amenity/animal_breeding.json create mode 100644 data/presets/presets/amenity/animal_shelter.json diff --git a/data/presets.yaml b/data/presets.yaml index e4499fb73..ef55d4049 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -1435,6 +1435,21 @@ en: amenity: # amenity=* name: Amenity + amenity/animal_boarding: + # amenity=animal_boarding + name: Animal Boarding Facility + # 'terms: boarding,cat,dog,horse,kitten,pet boarding,pet care,pet hotel,puppy,reptile' + terms: '' + amenity/animal_breeding: + # amenity=animal_breeding + name: Animal Breeding Facility + # 'terms: breeding,bull,cat,cow,dog,horse,husbandry,kitten,livestock,pet breeding,puppy,reptile' + terms: '' + amenity/animal_shelter: + # amenity=animal_shelter + name: Animal Shelter + # 'terms: adoption,aspca,cat,dog,horse,kitten,pet care,pet rescue,puppy,raptor,reptile,rescue,spca' + terms: '' amenity/arts_centre: # amenity=arts_centre name: Arts Center @@ -4043,7 +4058,7 @@ en: shop/pet: # shop=pet name: Pet Store - # 'terms: cat,dog,fish' + # 'terms: animal,cat,dog,fish,kitten,puppy,reptile' terms: '' shop/photo: # shop=photo diff --git a/data/presets/presets.json b/data/presets/presets.json index f6c82278c..d96b4cbd2 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -564,6 +564,98 @@ "name": "Swimming Pool", "searchable": false }, + "amenity/animal_boarding": { + "icon": "veterinary", + "fields": [ + "operator", + "address", + "building_area", + "opening_hours" + ], + "geometry": [ + "point", + "area" + ], + "terms": [ + "boarding", + "cat", + "dog", + "horse", + "kitten", + "pet boarding", + "pet care", + "pet hotel", + "puppy", + "reptile" + ], + "tags": { + "amenity": "animal_boarding" + }, + "name": "Animal Boarding Facility" + }, + "amenity/animal_breeding": { + "icon": "veterinary", + "fields": [ + "operator", + "address", + "building_area", + "opening_hours" + ], + "geometry": [ + "point", + "area" + ], + "terms": [ + "breeding", + "bull", + "cat", + "cow", + "dog", + "horse", + "husbandry", + "kitten", + "livestock", + "pet breeding", + "puppy", + "reptile" + ], + "tags": { + "amenity": "animal_breeding" + }, + "name": "Animal Breeding Facility" + }, + "amenity/animal_shelter": { + "icon": "veterinary", + "fields": [ + "operator", + "address", + "building_area", + "opening_hours" + ], + "geometry": [ + "point", + "area" + ], + "terms": [ + "adoption", + "aspca", + "cat", + "dog", + "horse", + "kitten", + "pet care", + "pet rescue", + "puppy", + "raptor", + "reptile", + "rescue", + "spca" + ], + "tags": { + "amenity": "animal_shelter" + }, + "name": "Animal Shelter" + }, "amenity/arts_centre": { "icon": "theatre", "fields": [ @@ -11344,9 +11436,13 @@ "area" ], "terms": [ + "animal", "cat", "dog", - "fish" + "fish", + "kitten", + "puppy", + "reptile" ], "tags": { "shop": "pet" diff --git a/data/presets/presets/amenity/animal_boarding.json b/data/presets/presets/amenity/animal_boarding.json new file mode 100644 index 000000000..f0832a8eb --- /dev/null +++ b/data/presets/presets/amenity/animal_boarding.json @@ -0,0 +1,29 @@ +{ + "icon": "veterinary", + "fields": [ + "operator", + "address", + "building_area", + "opening_hours" + ], + "geometry": [ + "point", + "area" + ], + "terms": [ + "boarding", + "cat", + "dog", + "horse", + "kitten", + "pet boarding", + "pet care", + "pet hotel", + "puppy", + "reptile" + ], + "tags": { + "amenity": "animal_boarding" + }, + "name": "Animal Boarding Facility" +} diff --git a/data/presets/presets/amenity/animal_breeding.json b/data/presets/presets/amenity/animal_breeding.json new file mode 100644 index 000000000..ddcdec17b --- /dev/null +++ b/data/presets/presets/amenity/animal_breeding.json @@ -0,0 +1,31 @@ +{ + "icon": "veterinary", + "fields": [ + "operator", + "address", + "building_area", + "opening_hours" + ], + "geometry": [ + "point", + "area" + ], + "terms": [ + "breeding", + "bull", + "cat", + "cow", + "dog", + "horse", + "husbandry", + "kitten", + "livestock", + "pet breeding", + "puppy", + "reptile" + ], + "tags": { + "amenity": "animal_breeding" + }, + "name": "Animal Breeding Facility" +} diff --git a/data/presets/presets/amenity/animal_shelter.json b/data/presets/presets/amenity/animal_shelter.json new file mode 100644 index 000000000..0212e60f8 --- /dev/null +++ b/data/presets/presets/amenity/animal_shelter.json @@ -0,0 +1,32 @@ +{ + "icon": "veterinary", + "fields": [ + "operator", + "address", + "building_area", + "opening_hours" + ], + "geometry": [ + "point", + "area" + ], + "terms": [ + "adoption", + "aspca", + "cat", + "dog", + "horse", + "kitten", + "pet care", + "pet rescue", + "puppy", + "raptor", + "reptile", + "rescue", + "spca" + ], + "tags": { + "amenity": "animal_shelter" + }, + "name": "Animal Shelter" +} diff --git a/data/presets/presets/shop/pet.json b/data/presets/presets/shop/pet.json index ee048d82e..4091f5d2a 100644 --- a/data/presets/presets/shop/pet.json +++ b/data/presets/presets/shop/pet.json @@ -11,9 +11,13 @@ "area" ], "terms": [ + "animal", "cat", "dog", - "fish" + "fish", + "kitten", + "puppy", + "reptile" ], "tags": { "shop": "pet" diff --git a/data/taginfo.json b/data/taginfo.json index fa7e5f33d..92890ac01 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -143,6 +143,18 @@ "key": "amenity", "value": "swimming_pool" }, + { + "key": "amenity", + "value": "animal_boarding" + }, + { + "key": "amenity", + "value": "animal_breeding" + }, + { + "key": "amenity", + "value": "animal_shelter" + }, { "key": "amenity", "value": "arts_centre" diff --git a/dist/locales/en.json b/dist/locales/en.json index e3e9f877d..c5ec1eed9 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -2000,6 +2000,18 @@ "name": "Swimming Pool", "terms": "" }, + "amenity/animal_boarding": { + "name": "Animal Boarding Facility", + "terms": "boarding,cat,dog,horse,kitten,pet boarding,pet care,pet hotel,puppy,reptile" + }, + "amenity/animal_breeding": { + "name": "Animal Breeding Facility", + "terms": "breeding,bull,cat,cow,dog,horse,husbandry,kitten,livestock,pet breeding,puppy,reptile" + }, + "amenity/animal_shelter": { + "name": "Animal Shelter", + "terms": "adoption,aspca,cat,dog,horse,kitten,pet care,pet rescue,puppy,raptor,reptile,rescue,spca" + }, "amenity/arts_centre": { "name": "Arts Center", "terms": "" @@ -4334,7 +4346,7 @@ }, "shop/pet": { "name": "Pet Store", - "terms": "cat,dog,fish" + "terms": "animal,cat,dog,fish,kitten,puppy,reptile" }, "shop/photo": { "name": "Photography Store", From 02742e2fc4fb12ff0656eef661bbc11f4657eb4d Mon Sep 17 00:00:00 2001 From: Bryan Housel Date: Thu, 16 Mar 2017 13:32:29 -0400 Subject: [PATCH 06/11] Add preset for amenity=watering_place (re: #3651) --- data/presets.yaml | 4 ++++ data/presets/presets.json | 12 ++++++++++++ data/presets/presets/amenity/watering_place.json | 12 ++++++++++++ data/taginfo.json | 4 ++++ dist/locales/en.json | 4 ++++ 5 files changed, 36 insertions(+) create mode 100644 data/presets/presets/amenity/watering_place.json diff --git a/data/presets.yaml b/data/presets.yaml index ef55d4049..6996ec942 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -1948,6 +1948,10 @@ en: # amenity=water_point name: RV Drinking Water terms: '' + amenity/watering_place: + # amenity=watering_place + name: Animal Watering Place + terms: '' area: # area=yes name: Area diff --git a/data/presets/presets.json b/data/presets/presets.json index d96b4cbd2..414242f02 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -2885,6 +2885,18 @@ }, "name": "RV Drinking Water" }, + "amenity/watering_place": { + "icon": "drinking-water", + "geometry": [ + "area", + "vertex", + "point" + ], + "tags": { + "amenity": "watering_place" + }, + "name": "Animal Watering Place" + }, "area": { "name": "Area", "tags": { diff --git a/data/presets/presets/amenity/watering_place.json b/data/presets/presets/amenity/watering_place.json new file mode 100644 index 000000000..12972f0ae --- /dev/null +++ b/data/presets/presets/amenity/watering_place.json @@ -0,0 +1,12 @@ +{ + "icon": "drinking-water", + "geometry": [ + "area", + "vertex", + "point" + ], + "tags": { + "amenity": "watering_place" + }, + "name": "Animal Watering Place" +} diff --git a/data/taginfo.json b/data/taginfo.json index 92890ac01..92929bb46 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -563,6 +563,10 @@ "key": "amenity", "value": "water_point" }, + { + "key": "amenity", + "value": "watering_place" + }, { "key": "area", "value": "yes" diff --git a/dist/locales/en.json b/dist/locales/en.json index c5ec1eed9..e753f6bb3 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -2420,6 +2420,10 @@ "name": "RV Drinking Water", "terms": "" }, + "amenity/watering_place": { + "name": "Animal Watering Place", + "terms": "" + }, "area": { "name": "Area", "terms": "" From 64b424beaa6d3701c883871ba64de01218ca2da4 Mon Sep 17 00:00:00 2001 From: Bryan Housel Date: Thu, 16 Mar 2017 13:40:03 -0400 Subject: [PATCH 07/11] Add preset for place=quarter (re: #3651) --- data/presets.yaml | 11 ++++++++--- data/presets/presets.json | 26 ++++++++++++++++++++++--- data/presets/presets/place/quarter.json | 19 ++++++++++++++++++ data/presets/presets/place/suburb.json | 7 ++++--- data/taginfo.json | 4 ++++ dist/locales/en.json | 8 ++++++-- 6 files changed, 64 insertions(+), 11 deletions(-) create mode 100644 data/presets/presets/place/quarter.json diff --git a/data/presets.yaml b/data/presets.yaml index 6996ec942..54c843350 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -3511,15 +3511,20 @@ en: name: Neighborhood # 'terms: neighbourhood' terms: '' + place/quarter: + # place=quarter + name: Sub-Borough / Quarter + # 'terms: boro,borough,quarter' + terms: '' place/square: # place=square name: Square terms: '' place/suburb: # place=suburb - name: Borough - # 'terms: Boro,Quarter' - terms: '' + name: Borough / Suburb + # 'terms: boro,borough,quarter' + terms: '' place/town: # place=town name: Town diff --git a/data/presets/presets.json b/data/presets/presets.json index 414242f02..f832f8694 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -9173,6 +9173,25 @@ ], "name": "Neighborhood" }, + "place/quarter": { + "icon": "triangle-stroked", + "fields": [ + "population" + ], + "geometry": [ + "point", + "area" + ], + "tags": { + "place": "quarter" + }, + "terms": [ + "boro", + "borough", + "quarter" + ], + "name": "Sub-Borough / Quarter" + }, "place/square": { "icon": "poi-foot", "geometry": [ @@ -9197,10 +9216,11 @@ "place": "suburb" }, "terms": [ - "Boro", - "Quarter" + "boro", + "borough", + "quarter" ], - "name": "Borough" + "name": "Borough / Suburb" }, "place/town": { "icon": "town", diff --git a/data/presets/presets/place/quarter.json b/data/presets/presets/place/quarter.json new file mode 100644 index 000000000..73757831d --- /dev/null +++ b/data/presets/presets/place/quarter.json @@ -0,0 +1,19 @@ +{ + "icon": "triangle-stroked", + "fields": [ + "population" + ], + "geometry": [ + "point", + "area" + ], + "tags": { + "place": "quarter" + }, + "terms": [ + "boro", + "borough", + "quarter" + ], + "name": "Sub-Borough / Quarter" +} diff --git a/data/presets/presets/place/suburb.json b/data/presets/presets/place/suburb.json index b1384e801..5006f654c 100644 --- a/data/presets/presets/place/suburb.json +++ b/data/presets/presets/place/suburb.json @@ -11,8 +11,9 @@ "place": "suburb" }, "terms": [ - "Boro", - "Quarter" + "boro", + "borough", + "quarter" ], - "name": "Borough" + "name": "Borough / Suburb" } diff --git a/data/taginfo.json b/data/taginfo.json index 92929bb46..61a8bda72 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -1983,6 +1983,10 @@ "key": "place", "value": "neighbourhood" }, + { + "key": "place", + "value": "quarter" + }, { "key": "place", "value": "square" diff --git a/dist/locales/en.json b/dist/locales/en.json index e753f6bb3..e32274bec 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -3856,13 +3856,17 @@ "name": "Neighborhood", "terms": "neighbourhood" }, + "place/quarter": { + "name": "Sub-Borough / Quarter", + "terms": "boro,borough,quarter" + }, "place/square": { "name": "Square", "terms": "" }, "place/suburb": { - "name": "Borough", - "terms": "Boro,Quarter" + "name": "Borough / Suburb", + "terms": "boro,borough,quarter" }, "place/town": { "name": "Town", From d2a314ff01deaf02ce336b02047e62b66de52fac Mon Sep 17 00:00:00 2001 From: Bryan Housel Date: Thu, 16 Mar 2017 13:55:48 -0400 Subject: [PATCH 08/11] Add preset for club=* (re: #3651) --- data/presets.yaml | 8 ++++++++ data/presets/fields.json | 5 +++++ data/presets/fields/club.json | 5 +++++ data/presets/presets.json | 21 +++++++++++++++++++++ data/presets/presets/club.json | 21 +++++++++++++++++++++ data/taginfo.json | 3 +++ dist/locales/en.json | 7 +++++++ 7 files changed, 70 insertions(+) create mode 100644 data/presets/fields/club.json create mode 100644 data/presets/presets/club.json diff --git a/data/presets.yaml b/data/presets.yaml index 54c843350..861a9fd4d 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -316,6 +316,9 @@ en: anticlockwise: Counterclockwise # direction=clockwise clockwise: Clockwise + club: + # club=* + label: Type collection_times: # collection_times=* label: Collection Times @@ -2189,6 +2192,11 @@ en: name: Camp Pitch # 'terms: tent,rv' terms: '' + club: + # club=* + name: Club + # 'terms: social' + terms: '' craft: # craft=* name: Craft diff --git a/data/presets/fields.json b/data/presets/fields.json index c51733d1b..1d329dea0 100644 --- a/data/presets/fields.json +++ b/data/presets/fields.json @@ -401,6 +401,11 @@ } } }, + "club": { + "key": "club", + "type": "typeCombo", + "label": "Type" + }, "collection_times": { "key": "collection_times", "type": "text", diff --git a/data/presets/fields/club.json b/data/presets/fields/club.json new file mode 100644 index 000000000..9483b0113 --- /dev/null +++ b/data/presets/fields/club.json @@ -0,0 +1,5 @@ +{ + "key": "club", + "type": "typeCombo", + "label": "Type" +} diff --git a/data/presets/presets.json b/data/presets/presets.json index f832f8694..db95c5e5d 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -3781,6 +3781,27 @@ }, "name": "Camp Pitch" }, + "club": { + "icon": "heart", + "fields": [ + "club", + "operator", + "address", + "building_area", + "opening_hours" + ], + "geometry": [ + "point", + "area" + ], + "tags": { + "club": "*" + }, + "terms": [ + "social" + ], + "name": "Club" + }, "craft": { "icon": "poi-tool", "fields": [ diff --git a/data/presets/presets/club.json b/data/presets/presets/club.json new file mode 100644 index 000000000..45d86d73e --- /dev/null +++ b/data/presets/presets/club.json @@ -0,0 +1,21 @@ +{ + "icon": "heart", + "fields": [ + "club", + "operator", + "address", + "building_area", + "opening_hours" + ], + "geometry": [ + "point", + "area" + ], + "tags": { + "club": "*" + }, + "terms": [ + "social" + ], + "name": "Club" +} diff --git a/data/taginfo.json b/data/taginfo.json index 61a8bda72..60fa5a30d 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -796,6 +796,9 @@ "key": "camp_site", "value": "camp_pitch" }, + { + "key": "club" + }, { "key": "craft" }, diff --git a/dist/locales/en.json b/dist/locales/en.json index e32274bec..e8cc898a0 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -1003,6 +1003,9 @@ "anticlockwise": "Counterclockwise" } }, + "club": { + "label": "Type" + }, "collection_times": { "label": "Collection Times" }, @@ -2656,6 +2659,10 @@ "name": "Camp Pitch", "terms": "tent,rv" }, + "club": { + "name": "Club", + "terms": "social" + }, "craft": { "name": "Craft", "terms": "" From af757d31bee00f5273e87fac6a22dca4e91c03ef Mon Sep 17 00:00:00 2001 From: Bryan Housel Date: Thu, 16 Mar 2017 16:16:35 -0400 Subject: [PATCH 09/11] General usability improvements * Reevaluate all featuers stroke widths for shadow, casing, stroke * Shadow width is important to make sure all features are easily clickable * Casing width is important to see oneway arrows * Make sure all line styles have normal and low-zoom variants * Show directional arrows for all waterway types --- css/20_map.css | 5 +- css/30_highways.css | 236 +++++++++++++++++++++++++----------- css/35_aeroways.css | 50 ++++++-- css/40_railways.css | 51 ++++++-- css/45_waterways.css | 73 ++++++++--- css/50_misc.css | 90 +++++++------- modules/behavior/breathe.js | 4 +- modules/osm/tags.js | 3 + 8 files changed, 347 insertions(+), 165 deletions(-) diff --git a/css/20_map.css b/css/20_map.css index 21f215e51..abcc08cf5 100644 --- a/css/20_map.css +++ b/css/20_map.css @@ -32,7 +32,7 @@ g.point .stroke { g.point .shadow { fill: none; stroke: #f6634f; - stroke-width: 8; + stroke-width: 16; stroke-opacity: 0; } @@ -74,6 +74,7 @@ g.midpoint .fill { g.vertex .shadow, g.midpoint .shadow { + stroke-width: 16; fill: #f6634f; fill-opacity: 0; } @@ -141,7 +142,7 @@ path.stroke { path.shadow { stroke: #f6634f; - stroke-width: 10; + stroke-width: 16; stroke-opacity: 0; } diff --git a/css/30_highways.css b/css/30_highways.css index 937dea366..76505ebf0 100644 --- a/css/30_highways.css +++ b/css/30_highways.css @@ -1,39 +1,44 @@ /* highways */ +.preset-icon .icon.tag-highway.other-line { + color: #fff; + fill: #777; +} +path.casing.tag-highway { + stroke: #444; +} +path.stroke.tag-highway { + stroke: #ccc; +} + /* highway areas */ + path.stroke.area.tag-highway { - stroke:#fff; + stroke: #fff; stroke-dasharray: none; stroke-width: 2; } /* wide highways */ -.preset-icon .icon.tag-highway.other-line { - color: #fff; - fill: #777; -} - path.shadow.tag-highway { - stroke-width:16; + stroke-width: 20; } path.casing.tag-highway { - stroke:#444; - stroke-width:10; + stroke-width: 10; } path.stroke.tag-highway { - stroke:#ccc; - stroke-width:8; + stroke-width: 8; } .low-zoom path.shadow.tag-highway { - stroke-width:12; + stroke-width: 16; } .low-zoom path.casing.tag-highway { - stroke-width:6; + stroke-width: 7; } .low-zoom path.stroke.tag-highway { - stroke-width:4; + stroke-width: 5; } .preset-icon .icon.highway-motorway, @@ -224,33 +229,54 @@ path.casing.tag-unclassified { /* narrow highways */ -path.stroke.tag-highway-living_street, -path.stroke.tag-highway-service, -path.stroke.tag-highway-track, -path.stroke.tag-highway-path, -path.stroke.tag-highway-footway, -path.stroke.tag-highway-cycleway, -path.stroke.tag-highway-bridleway, -path.stroke.tag-highway-corridor, -path.stroke.tag-highway-pedestrian, -path.stroke.tag-highway-steps, -path.stroke.tag-highway-road, -path.stroke.tag-living_street, -path.stroke.tag-service, -path.stroke.tag-track, -path.stroke.tag-path, -path.stroke.tag-footway, -path.stroke.tag-cycleway, -path.stroke.tag-bridleway, -path.stroke.tag-corridor, -path.stroke.tag-pedestrian, -path.stroke.tag-steps, -path.stroke.tag-road { - stroke-width:4; + +path.shadow.tag-highway-living_street, +path.shadow.tag-highway-service, +path.shadow.tag-highway-track, +path.shadow.tag-highway-road, +path.shadow.tag-living_street, +path.shadow.tag-service, +path.shadow.tag-track, +path.shadow.tag-road { + stroke-width: 16; } path.casing.tag-highway-living_street, path.casing.tag-highway-service, path.casing.tag-highway-track, +path.casing.tag-highway-road, +path.casing.tag-living_street, +path.casing.tag-service, +path.casing.tag-track, +path.casing.tag-road { + stroke-width: 7; +} +path.stroke.tag-highway-living_street, +path.stroke.tag-highway-service, +path.stroke.tag-highway-track, +path.stroke.tag-highway-road, +path.stroke.tag-living_street, +path.stroke.tag-service, +path.stroke.tag-track, +path.stroke.tag-road { + stroke-width: 5; +} + +path.shadow.tag-highway-path, +path.shadow.tag-highway-footway, +path.shadow.tag-highway-cycleway, +path.shadow.tag-highway-bridleway, +path.shadow.tag-highway-corridor, +path.shadow.tag-highway-pedestrian, +path.shadow.tag-highway-steps, +path.shadow.tag-path, +path.shadow.tag-footway, +path.shadow.tag-cycleway, +path.shadow.tag-bridleway, +path.shadow.tag-corridor, +path.shadow.tag-pedestrian, +path.shadow.tag-steps { + stroke-width: 16; +} path.casing.tag-highway-path, path.casing.tag-highway-footway, path.casing.tag-highway-cycleway, @@ -258,48 +284,79 @@ path.casing.tag-highway-bridleway, path.casing.tag-highway-corridor, path.casing.tag-highway-pedestrian, path.casing.tag-highway-steps, -path.casing.tag-highway-road, -path.casing.tag-living_street, -path.casing.tag-service, -path.casing.tag-track, path.casing.tag-path, path.casing.tag-footway, path.casing.tag-cycleway, path.casing.tag-bridleway, path.casing.tag-corridor, path.casing.tag-pedestrian, -path.casing.tag-steps, -path.casing.tag-road { - stroke-width:6; +path.casing.tag-steps { + stroke-width: 5; +} +path.stroke.tag-highway-path, +path.stroke.tag-highway-footway, +path.stroke.tag-highway-cycleway, +path.stroke.tag-highway-bridleway, +path.stroke.tag-highway-corridor, +path.stroke.tag-highway-pedestrian, +path.stroke.tag-highway-steps, +path.stroke.tag-path, +path.stroke.tag-footway, +path.stroke.tag-cycleway, +path.stroke.tag-bridleway, +path.stroke.tag-corridor, +path.stroke.tag-pedestrian, +path.stroke.tag-steps { + stroke-width: 3; } -.low-zoom path.stroke.tag-highway-living_street, -.low-zoom path.stroke.tag-highway-service, -.low-zoom path.stroke.tag-highway-track, -.low-zoom path.stroke.tag-highway-path, -.low-zoom path.stroke.tag-highway-footway, -.low-zoom path.stroke.tag-highway-cycleway, -.low-zoom path.stroke.tag-highway-bridleway, -.low-zoom path.stroke.tag-highway-corridor, -.low-zoom path.stroke.tag-highway-pedestrian, -.low-zoom path.stroke.tag-highway-steps, -.low-zoom path.stroke.tag-highway-road, -.low-zoom path.stroke.tag-living_street, -.low-zoom path.stroke.tag-service, -.low-zoom path.stroke.tag-track, -.low-zoom path.stroke.tag-path, -.low-zoom path.stroke.tag-footway, -.low-zoom path.stroke.tag-cycleway, -.low-zoom path.stroke.tag-bridleway, -.low-zoom path.stroke.tag-corridor, -.low-zoom path.stroke.tag-pedestrian, -.low-zoom path.stroke.tag-steps, -.low-zoom path.stroke.tag-road { - stroke-width:2; +.low-zoom path.shadow.tag-highway-living_street, +.low-zoom path.shadow.tag-highway-service, +.low-zoom path.shadow.tag-highway-track, +.low-zoom path.shadow.tag-highway-road, +.low-zoom path.shadow.tag-living_street, +.low-zoom path.shadow.tag-service, +.low-zoom path.shadow.tag-track, +.low-zoom path.shadow.tag-road { + stroke-width: 12; } .low-zoom path.casing.tag-highway-living_street, .low-zoom path.casing.tag-highway-service, .low-zoom path.casing.tag-highway-track, +.low-zoom path.casing.tag-highway-road, +.low-zoom path.casing.tag-living_street, +.low-zoom path.casing.tag-service, +.low-zoom path.casing.tag-track, +.low-zoom path.casing.tag-road { + stroke-width: 5; +} +.low-zoom path.stroke.tag-highway-living_street, +.low-zoom path.stroke.tag-highway-service, +.low-zoom path.stroke.tag-highway-track, +.low-zoom path.stroke.tag-highway-road, +.low-zoom path.stroke.tag-living_street, +.low-zoom path.stroke.tag-service, +.low-zoom path.stroke.tag-track, +.low-zoom path.stroke.tag-road { + stroke-width: 3; +} + +.low-zoom path.shadow.tag-highway-path, +.low-zoom path.shadow.tag-highway-footway, +.low-zoom path.shadow.tag-highway-cycleway, +.low-zoom path.shadow.tag-highway-bridleway, +.low-zoom path.shadow.tag-highway-corridor, +.low-zoom path.shadow.tag-highway-pedestrian, +.low-zoom path.shadow.tag-highway-steps, +.low-zoom path.shadow.tag-path, +.low-zoom path.shadow.tag-footway, +.low-zoom path.shadow.tag-cycleway, +.low-zoom path.shadow.tag-bridleway, +.low-zoom path.shadow.tag-corridor, +.low-zoom path.shadow.tag-pedestrian, +.low-zoom path.shadow.tag-steps { + stroke-width: 12; +} .low-zoom path.casing.tag-highway-path, .low-zoom path.casing.tag-highway-footway, .low-zoom path.casing.tag-highway-cycleway, @@ -307,20 +364,32 @@ path.casing.tag-road { .low-zoom path.casing.tag-highway-corridor, .low-zoom path.casing.tag-highway-pedestrian, .low-zoom path.casing.tag-highway-steps, -.low-zoom path.casing.tag-highway-road, -.low-zoom path.casing.tag-living_street, -.low-zoom path.casing.tag-service, -.low-zoom path.casing.tag-track, .low-zoom path.casing.tag-path, .low-zoom path.casing.tag-footway, .low-zoom path.casing.tag-cycleway, .low-zoom path.casing.tag-bridleway, .low-zoom path.casing.tag-corridor, .low-zoom path.casing.tag-pedestrian, -.low-zoom path.casing.tag-steps, -.low-zoom path.casing.tag-road { - stroke-width:4; +.low-zoom path.casing.tag-steps { + stroke-width: 3; } +.low-zoom path.stroke.tag-highway-path, +.low-zoom path.stroke.tag-highway-footway, +.low-zoom path.stroke.tag-highway-cycleway, +.low-zoom path.stroke.tag-highway-bridleway, +.low-zoom path.stroke.tag-highway-corridor, +.low-zoom path.stroke.tag-highway-pedestrian, +.low-zoom path.stroke.tag-highway-steps, +.low-zoom path.stroke.tag-path, +.low-zoom path.stroke.tag-footway, +.low-zoom path.stroke.tag-cycleway, +.low-zoom path.stroke.tag-bridleway, +.low-zoom path.stroke.tag-corridor, +.low-zoom path.stroke.tag-pedestrian, +.low-zoom path.stroke.tag-steps { + stroke-width: 1; +} + .preset-icon .icon.highway-living-street { color: #bbb; @@ -347,6 +416,12 @@ path.stroke.tag-pedestrian { stroke:#fff; stroke-dasharray: 2, 8; } +.low-zoom path.stroke.tag-highway-corridor, +.low-zoom path.stroke.tag-highway-pedestrian, +.low-zoom path.stroke.tag-corridor, +.low-zoom path.stroke.tag-pedestrian { + stroke-dasharray: 1, 4; +} path.casing.tag-highway-corridor, path.casing.tag-highway-pedestrian, path.casing.tag-corridor, @@ -406,6 +481,13 @@ path.stroke.tag-highway-bridleway { stroke-linecap: butt; stroke-dasharray: 6, 6; } +.low-zoom path.stroke.tag-highway-path, +.low-zoom path.stroke.tag-highway-footway, +.low-zoom path.stroke.tag-highway-cycleway, +.low-zoom path.stroke.tag-highway-bridleway { + stroke-linecap: butt; + stroke-dasharray: 3, 3; +} path.casing.tag-highway-path, path.casing.tag-highway-path.tag-unpaved { @@ -450,6 +532,9 @@ path.stroke.tag-highway-footway.tag-crossing { stroke: #444; stroke-dasharray: 6, 4; } +.low-zoom path.stroke.tag-highway-footway.tag-crossing { + stroke-dasharray: 3, 2; +} .preset-icon .icon.tag-route-bicycle, .preset-icon .icon.highway-cycleway { @@ -478,6 +563,9 @@ path.stroke.tag-highway-steps { stroke-linecap: butt; stroke-dasharray: 3, 3; } +.low-zoom path.stroke.tag-highway-steps { + stroke-dasharray: 2, 2; +} path.casing.tag-highway-steps, path.casing.tag-highway-steps.tag-unpaved { stroke: #fff; diff --git a/css/35_aeroways.css b/css/35_aeroways.css index 13f94f992..7598949d3 100644 --- a/css/35_aeroways.css +++ b/css/35_aeroways.css @@ -7,23 +7,32 @@ path.stroke.area.tag-aeroway { stroke-width: 2; } -/* lines */ -path.stroke.tag-aeroway-taxiway, -path.stroke.tag-taxiway { - stroke-width: 4; +/* narrow aeroways (taxiway) */ + +path.shadow.tag-aeroway-taxiway, +path.shadow.tag-taxiway { + stroke-width: 16; } path.casing.tag-aeroway-taxiway, path.casing.tag-taxiway { - stroke-width: 6; + stroke-width: 7; +} +path.stroke.tag-aeroway-taxiway, +path.stroke.tag-taxiway { + stroke-width: 5; } -.low-zoom path.stroke.tag-aeroway-taxiway, -.low-zoom path.stroke.tag-taxiway { - stroke-width: 2; +.low-zoom path.shadow.tag-aeroway-taxiway, +.low-zoom path.shadow.tag-taxiway { + stroke-width: 12; } .low-zoom path.casing.tag-aeroway-taxiway, .low-zoom path.casing.tag-taxiway { - stroke-width: 4; + stroke-width: 5; +} +.low-zoom path.stroke.tag-aeroway-taxiway, +.low-zoom path.stroke.tag-taxiway { + stroke-width: 3; } .preset-icon .icon.tag-aeroway-taxiway, @@ -40,6 +49,9 @@ path.casing.tag-taxiway { stroke: #666; } + +/* wide aeroways (runway) */ + .preset-icon .icon.tag-aeroway-runway, .preset-icon .icon.tag-runway { color: #444; @@ -48,17 +60,29 @@ path.casing.tag-taxiway { path.shadow.tag-aeroway-runway { stroke-width: 20; } +path.casing.tag-aeroway-runway { + stroke-width: 10; + stroke: #000; + stroke-linecap: square; +} path.stroke.tag-aeroway-runway { stroke: #fff; stroke-width: 2; stroke-linecap: butt; stroke-dasharray: 24, 48; } -path.casing.tag-aeroway-runway { - stroke-width: 10; - stroke: #000; - stroke-linecap: square; + +.low-zoom path.shadow.tag-aeroway-runway { + stroke-width: 16; } +.low-zoom path.casing.tag-aeroway-runway { + stroke-width: 7; +} +.low-zoom path.stroke.tag-aeroway-runway { + stroke-width: 2; + stroke-dasharray: 12, 24; +} + path.fill.tag-aeroway-runway { stroke: rgba(0, 0, 0, 0.6); fill: rgba(0, 0, 0, 0.6); diff --git a/css/40_railways.css b/css/40_railways.css index aaf62bf82..4649ae2ea 100644 --- a/css/40_railways.css +++ b/css/40_railways.css @@ -8,48 +8,77 @@ color: #555; fill: #eee; } + +/* narrow widths */ + +path.shadow.tag-railway { + stroke-width: 16; +} +path.casing.tag-railway { + stroke-width: 7; +} path.stroke.tag-railway { - stroke: #eee; stroke-width: 2; stroke-linecap: butt; stroke-dasharray: 12,12; } + +.low-zoom path.shadow.tag-railway { + stroke-width: 12; +} +.low-zoom path.casing.tag-railway { + stroke-width: 5; +} +.low-zoom path.stroke.tag-railway { + stroke-width: 2; + stroke-dasharray: 6,6; +} + + +/* styles */ + path.casing.tag-railway { stroke: #555; - stroke-width: 4; } +path.stroke.tag-railway { + stroke: #eee; +} + .preset-icon .icon.tag-railway-disused, .preset-icon .icon.tag-railway-abandoned { color: #999; fill: #eee; } -path.stroke.tag-railway-abandoned { - stroke: #eee; -} path.casing.tag-railway-abandoned { stroke: #999; } +path.stroke.tag-railway-abandoned { + stroke: #eee; +} + .preset-icon .icon.tag-railway-subway { color: #222; fill: #bbb; } -path.stroke.tag-railway-subway { - stroke: #bbb; -} path.casing.tag-railway-subway { stroke: #222; } +path.stroke.tag-railway-subway { + stroke: #bbb; +} + +path.casing.tag-railway-platform { + stroke: none; +} path.stroke.tag-railway-platform { stroke: #999; stroke-width: 4; stroke-dasharray: none; } -path.casing.tag-railway-platform { - stroke: none; -} + .area.stroke.tag-railway { stroke: white; diff --git a/css/45_waterways.css b/css/45_waterways.css index ca51b1a7b..44996a97e 100644 --- a/css/45_waterways.css +++ b/css/45_waterways.css @@ -15,35 +15,72 @@ path.fill.tag-waterway { stroke: rgba(119, 211, 222, 0.3); fill: rgba(119, 211, 222, 0.3); } - +path.casing.tag-waterway { + stroke: #3d6c71; +} path.stroke.tag-waterway { stroke: #77d3de; - stroke-width: 2; +} + + +/* narrow waterways (default) */ + +path.shadow.tag-waterway { + stroke-width: 16; } path.casing.tag-waterway { - stroke: #77d3de; - stroke-width: 4; + stroke-width: 7; +} +path.stroke.tag-waterway { + stroke-width: 5; } -path.stroke.tag-waterway-river { - stroke-width: 4; +.low-zoom path.shadow.tag-waterway { + stroke-width: 12; } -path.casing.tag-waterway-river { - stroke-width: 6; +.low-zoom path.casing.tag-waterway { + stroke-width: 5; } - -.preset-icon .icon.tag-waterway-ditch { - color: #6591ff; -} -path.stroke.tag-waterway-ditch { - stroke: #6591ff; - stroke-width: 1; -} -path.casing.tag-waterway-ditch { - stroke: #6591ff; +.low-zoom path.stroke.tag-waterway { stroke-width: 3; } + +/* wide waterways (river) */ + +path.shadow.tag-waterway-river { + stroke-width: 20; +} +path.casing.tag-waterway-river { + stroke-width: 10; +} +path.stroke.tag-waterway-river { + stroke-width: 8; +} + +.low-zoom path.shadow.tag-waterway-river { + stroke-width: 16; +} +.low-zoom path.casing.tag-waterway-river { + stroke-width: 7; +} +.low-zoom path.stroke.tag-waterway-river { + stroke-width: 5; +} + + +/* ditch */ + +.preset-icon .icon.tag-waterway-ditch { + color: #8eabf3; +} +path.stroke.tag-waterway-ditch { + stroke: #8eabf3; +} + + +/* waterway areas */ + path.area.stroke.tag-waterway-dock, path.area.stroke.tag-waterway-boatyard, path.area.stroke.tag-waterway-fuel { diff --git a/css/50_misc.css b/css/50_misc.css index fb1a9332c..faae427ad 100644 --- a/css/50_misc.css +++ b/css/50_misc.css @@ -48,7 +48,6 @@ path.stroke.tag-barrier { /* bridges */ path.casing.tag-bridge { - stroke-width: 16; stroke-opacity: 0.6; stroke: #000; stroke-linecap: butt; @@ -58,6 +57,29 @@ path.casing.tag-bridge { path.shadow.tag-bridge { stroke-width: 22; } +path.casing.tag-bridge { + stroke-width: 16; +} +.low-zoom path.shadow.tag-bridge { + stroke-width: 14; +} +.low-zoom path.casing.tag-bridge { + stroke-width: 10; +} + +path.shadow.line.tag-railway.tag-bridge, +path.shadow.tag-highway-living_street.tag-bridge, +path.shadow.tag-highway-path.tag-bridge, +path.shadow.tag-highway-corridor.tag-bridge, +path.shadow.line.tag-highway-pedestrian.tag-bridge, +path.shadow.tag-highway-service.tag-bridge, +path.shadow.tag-highway-track.tag-bridge, +path.shadow.tag-highway-steps.tag-bridge, +path.shadow.tag-highway-footway.tag-bridge, +path.shadow.tag-highway-cycleway.tag-bridge, +path.shadow.tag-highway-bridleway.tag-bridge { + stroke-width: 17; +} path.casing.line.tag-railway.tag-bridge, path.casing.tag-highway-living_street.tag-bridge, path.casing.tag-highway-path.tag-bridge, @@ -71,39 +93,6 @@ path.casing.tag-highway-cycleway.tag-bridge, path.casing.tag-highway-bridleway.tag-bridge { stroke-width: 10; } -path.shadow.line.tag-railway.tag-bridge, -path.shadow.tag-highway-living_street.tag-bridge, -path.shadow.tag-highway-path.tag-bridge, -path.shadow.tag-highway-corridor.tag-bridge, -path.shadow.line.tag-highway-pedestrian.tag-bridge, -path.shadow.tag-highway-service.tag-bridge, -path.shadow.tag-highway-track.tag-bridge, -path.shadow.tag-highway-steps.tag-bridge, -path.shadow.tag-highway-footway.tag-bridge, -path.shadow.tag-highway-cycleway.tag-bridge, -path.shadow.tag-highway-bridleway.tag-bridge { - stroke-width: 17; -} -.low-zoom path.casing.tag-bridge { - stroke-width: 10; -} -.low-zoom path.shadow.tag-bridge { - stroke-width: 14; -} - -.low-zoom path.casing.line.tag-railway.tag-bridge, -.low-zoom path.casing.tag-highway-living_street.tag-bridge, -.low-zoom path.casing.tag-highway-path.tag-bridge, -.low-zoom path.casing.tag-highway-corridor.tag-bridge, -.low-zoom path.casing.line.tag-highway-pedestrian.tag-bridge, -.low-zoom path.casing.tag-highway-service.tag-bridge, -.low-zoom path.casing.tag-highway-track.tag-bridge, -.low-zoom path.casing.tag-highway-steps.tag-bridge, -.low-zoom path.casing.tag-highway-footway.tag-bridge, -.low-zoom path.casing.tag-highway-cycleway.tag-bridge, -.low-zoom path.casing.tag-highway-bridleway.tag-bridge { - stroke-width: 6; -} .low-zoom path.shadow.line.tag-railway.tag-bridge, .low-zoom path.shadow.tag-highway-living_street.tag-bridge, @@ -116,7 +105,20 @@ path.shadow.tag-highway-bridleway.tag-bridge { .low-zoom path.shadow.tag-highway-footway.tag-bridge, .low-zoom path.shadow.tag-highway-cycleway.tag-bridge, .low-zoom path.shadow.tag-highway-bridleway.tag-bridge { - stroke-width: 13; + stroke-width: 14; +} +.low-zoom path.casing.line.tag-railway.tag-bridge, +.low-zoom path.casing.tag-highway-living_street.tag-bridge, +.low-zoom path.casing.tag-highway-path.tag-bridge, +.low-zoom path.casing.tag-highway-corridor.tag-bridge, +.low-zoom path.casing.line.tag-highway-pedestrian.tag-bridge, +.low-zoom path.casing.tag-highway-service.tag-bridge, +.low-zoom path.casing.tag-highway-track.tag-bridge, +.low-zoom path.casing.tag-highway-steps.tag-bridge, +.low-zoom path.casing.tag-highway-footway.tag-bridge, +.low-zoom path.casing.tag-highway-cycleway.tag-bridge, +.low-zoom path.casing.tag-highway-bridleway.tag-bridge { + stroke-width: 6; } @@ -132,6 +134,10 @@ path.casing.tag-tunnel { /* embankments / cuttings */ +path.shadow.tag-embankment, +path.shadow.tag-cutting { + stroke-width: 28; +} path.casing.tag-embankment, path.casing.tag-cutting { stroke-opacity: 0.5; @@ -141,20 +147,14 @@ path.casing.tag-cutting { stroke-linecap: butt; } -path.shadow.tag-embankment, -path.shadow.tag-cutting { - stroke-width: 28; -} - -.low-zoom path.casing.tag-embankment, -.low-zoom path.casing.tag-cutting { - stroke-width: 10; -} - .low-zoom path.shadow.tag-embankment, .low-zoom path.shadow.tag-cutting { stroke-width: 14; } +.low-zoom path.casing.tag-embankment, +.low-zoom path.casing.tag-cutting { + stroke-width: 10; +} /* Surface - unpaved */ diff --git a/modules/behavior/breathe.js b/modules/behavior/breathe.js index 5591bd560..80870914f 100644 --- a/modules/behavior/breathe.js +++ b/modules/behavior/breathe.js @@ -94,8 +94,8 @@ export function behaviorBreathe() { p.tag = tag; p.from.opacity = opacity * 0.6; p.to.opacity = opacity * 1.25; - p.from.width = width * 0.9; - p.to.width = width * (tag === 'circle' ? 1.5 : 1.25); + p.from.width = width * 0.7; + p.to.width = width * (tag === 'circle' ? 1.5 : 1); params[d.id] = p; }); } diff --git a/modules/osm/tags.js b/modules/osm/tags.js index b28d45a11..37fc8434a 100644 --- a/modules/osm/tags.js +++ b/modules/osm/tags.js @@ -35,6 +35,9 @@ export var osmOneWayTags = { 'yes': true }, 'waterway': { + 'canal': true, + 'ditch': true, + 'drain': true, 'river': true, 'stream': true } From 3a175c277c1585757f281cc7eab82201515af8e1 Mon Sep 17 00:00:00 2001 From: Bryan Housel Date: Thu, 16 Mar 2017 16:29:36 -0400 Subject: [PATCH 10/11] Relax wireframe rules to breathe interpolation can happen --- css/70_fills.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/css/70_fills.css b/css/70_fills.css index 6d564417a..9402eec5d 100644 --- a/css/70_fills.css +++ b/css/70_fills.css @@ -10,15 +10,15 @@ .low-zoom.fill-wireframe path.shadow, .fill-wireframe path.shadow { - stroke-width: 8 !important; + stroke-width: 12; } .fill-wireframe path.shadow.related:not(.selected), .fill-wireframe path.shadow.hover:not(.selected) { - stroke-opacity: 0.4 !important; + stroke-opacity: 0.4; } .fill-wireframe path.shadow.selected { - stroke-opacity: 0.6 !important; + stroke-opacity: 0.6; } .fill-wireframe .point, From e4392ced3afe021283c0648b8e0c2aa5c6a6eec2 Mon Sep 17 00:00:00 2001 From: 51114u9 Date: Thu, 16 Mar 2017 16:29:50 -0400 Subject: [PATCH 11/11] fix style for text direction --- css/80_app.css | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/css/80_app.css b/css/80_app.css index e8f927b87..cfd30e4a6 100644 --- a/css/80_app.css +++ b/css/80_app.css @@ -188,12 +188,12 @@ input[type=email] { text-overflow: ellipsis; } [dir='rtl'] textarea, -input[type=text], -input[type=search], -input[type=number], -input[type=url], -input[type=tel], -input[type=email] { +[dir='rtl'] input[type=text], +[dir='rtl'] input[type=search], +[dir='rtl'] input[type=number], +[dir='rtl'] input[type=url], +[dir='rtl'] input[type=tel], +[dir='rtl'] input[type=email] { padding:5px 10px 5px 25px; }