Skip to content

Commit

Permalink
Remove geometry type selection from the preset browser (#6760)
Browse files Browse the repository at this point in the history
Add toolbar item to toggle the geometry type when adding a feature
Detach geometry types from favorite and recent presets
Update some presets to indicate the preferred geometry types
Don't show standalone point frames for preset icons in the preset browser or quick preset buttons
Update the "Add Feature" button icon to show specific instead of generic features
  • Loading branch information
quincylvania committed Aug 15, 2019
1 parent f0bc877 commit c4a469e
Show file tree
Hide file tree
Showing 44 changed files with 348 additions and 359 deletions.
6 changes: 2 additions & 4 deletions css/80_app.css
Original file line number Diff line number Diff line change
Expand Up @@ -564,12 +564,10 @@ button.bar-button .label {
margin-right: 6px;
}
[dir='ltr'] .toolbar-item.add-feature .disclosure-icon {
margin-left: 2px;
margin-right: -2px;
margin-left: 4px;
}
[dir='rtl'] .toolbar-item.add-feature .disclosure-icon {
margin-left: -2px;
margin-right: 2px;
margin-right: 4px;
}

button.bar-button.dragging {
Expand Down
10 changes: 1 addition & 9 deletions data/core.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,11 @@ en:
tooltip: Customize the toolbar.
assistant:
mode:
adding: Adding
authenticating: Authenticating
drawing: Drawing
editing: Editing
mapping: Mapping
placing: Placing
saving: Saving
viewing: Viewing
instructions:
Expand Down Expand Up @@ -116,14 +116,6 @@ en:
key: N
add_preset:
title: "Add {feature}"
point:
title: "Add {feature} as a point"
line:
title: "Add {feature} as a line"
area:
title: "Add {feature} as an area"
building:
title: "Add {feature} as a building"
browse:
title: Browse
description: Pan and zoom the map.
Expand Down
78 changes: 39 additions & 39 deletions data/presets/presets.json

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions data/presets/presets/amenity/college.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
"wheelchair"
],
"geometry": [
"point",
"area"
"area",
"point"
],
"terms": [
"university",
Expand Down
4 changes: 2 additions & 2 deletions data/presets/presets/amenity/crematorium.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
"wheelchair"
],
"geometry": [
"area",
"point"
"point",
"area"
],
"tags": {
"amenity": "crematorium"
Expand Down
4 changes: 2 additions & 2 deletions data/presets/presets/amenity/hospital.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
"wheelchair"
],
"geometry": [
"point",
"area"
"area",
"point"
],
"terms": [
"clinic",
Expand Down
4 changes: 2 additions & 2 deletions data/presets/presets/amenity/kindergarten.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
"wheelchair"
],
"geometry": [
"point",
"area"
"area",
"point"
],
"terms": [
"kindergarden",
Expand Down
4 changes: 2 additions & 2 deletions data/presets/presets/amenity/monastery.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
"wheelchair"
],
"geometry": [
"point",
"area"
"area",
"point"
],
"terms": [
"abbey",
Expand Down
4 changes: 2 additions & 2 deletions data/presets/presets/amenity/parking.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@
"wheelchair"
],
"geometry": [
"area",
"point",
"vertex",
"area"
"vertex"
],
"tags": {
"amenity": "parking"
Expand Down
4 changes: 2 additions & 2 deletions data/presets/presets/amenity/parking/park_ride.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"icon": "maki-car",
"geometry": [
"area",
"point",
"vertex",
"area"
"vertex"
],
"tags": {
"amenity": "parking",
Expand Down
4 changes: 2 additions & 2 deletions data/presets/presets/amenity/parking/underground.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
"layer"
],
"geometry": [
"area",
"point",
"vertex",
"area"
"vertex"
],
"tags": {
"amenity": "parking",
Expand Down
4 changes: 2 additions & 2 deletions data/presets/presets/amenity/parking_space.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
"capacity"
],
"geometry": [
"area",
"point",
"vertex",
"area"
"vertex"
],
"terms": [],
"tags": {
Expand Down
4 changes: 2 additions & 2 deletions data/presets/presets/amenity/prison.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
"wheelchair"
],
"geometry": [
"point",
"area"
"area",
"point"
],
"terms": [
"cell",
Expand Down
4 changes: 2 additions & 2 deletions data/presets/presets/amenity/school.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
"wheelchair"
],
"geometry": [
"point",
"area"
"area",
"point"
],
"terms": [
"academy",
Expand Down
4 changes: 2 additions & 2 deletions data/presets/presets/amenity/university.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
"{amenity/college}"
],
"geometry": [
"point",
"area"
"area",
"point"
],
"terms": [
"college",
Expand Down
4 changes: 2 additions & 2 deletions data/presets/presets/amenity/water_point.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
"opening_hours"
],
"geometry": [
"area",
"point",
"vertex",
"point"
"area"
],
"tags": {
"amenity": "water_point"
Expand Down
4 changes: 2 additions & 2 deletions data/presets/presets/amenity/watering_place.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
"opening_hours"
],
"geometry": [
"area",
"point",
"vertex",
"point"
"area"
],
"tags": {
"amenity": "watering_place"
Expand Down
4 changes: 2 additions & 2 deletions data/presets/presets/leisure/park.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
"fax"
],
"geometry": [
"point",
"area"
"area",
"point"
],
"terms": [
"esplanade",
Expand Down
4 changes: 2 additions & 2 deletions data/presets/presets/leisure/swimming_pool.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
"operator"
],
"geometry": [
"point",
"area"
"area",
"point"
],
"terms": [
"dive",
Expand Down
4 changes: 2 additions & 2 deletions data/presets/presets/man_made/storage_tank.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
"manufacturer"
],
"geometry": [
"point",
"area"
"area",
"point"
],
"terms": [
"water",
Expand Down
4 changes: 2 additions & 2 deletions data/presets/presets/man_made/water_tower.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
"height"
],
"geometry": [
"point",
"area"
"area",
"point"
],
"tags": {
"man_made": "water_tower"
Expand Down
4 changes: 2 additions & 2 deletions data/presets/presets/natural/reef.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"icon": "temaki-beach",
"geometry": [
"point",
"area"
"area",
"point"
],
"tags": {
"natural": "reef"
Expand Down
4 changes: 2 additions & 2 deletions data/presets/presets/natural/wood.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
"leaf_cycle"
],
"geometry": [
"point",
"area"
"area",
"point"
],
"tags": {
"natural": "wood"
Expand Down
6 changes: 3 additions & 3 deletions data/presets/presets/waterway/water_point.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"icon": "maki-drinking-water",
"geometry": [
"area",
"vertex",
"point"
"point",
"vertex",
"area"
],
"tags": {
"waterway": "water_point"
Expand Down
Loading

0 comments on commit c4a469e

Please sign in to comment.