Remove geometry type selection from the preset browser (#6760)

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
facebook · Aug 15, 2019 · c4a469e · c4a469e
1 parent f0bc877
commit c4a469e
Show file tree

Hide file tree

Showing 44 changed files with 348 additions and 359 deletions.
diff --git a/css/80_app.css b/css/80_app.css
@@ -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 {

diff --git a/data/core.yaml b/data/core.yaml
@@ -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:
@@ -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.

diff --git a/data/presets/presets.json b/data/presets/presets.json
diff --git a/data/presets/presets/amenity/college.json b/data/presets/presets/amenity/college.json
@@ -19,8 +19,8 @@
         "wheelchair"
     ],
     "geometry": [
-        "point",
-        "area"
+        "area",
+        "point"
     ],
     "terms": [
         "university",

diff --git a/data/presets/presets/amenity/crematorium.json b/data/presets/presets/amenity/crematorium.json
@@ -16,8 +16,8 @@
         "wheelchair"
     ],
     "geometry": [
-        "area",
-        "point"
+        "point",
+        "area"
     ],
     "tags": {
         "amenity": "crematorium"

diff --git a/data/presets/presets/amenity/hospital.json b/data/presets/presets/amenity/hospital.json
@@ -19,8 +19,8 @@
         "wheelchair"
     ],
     "geometry": [
-        "point",
-        "area"
+        "area",
+        "point"
     ],
     "terms": [
         "clinic",

diff --git a/data/presets/presets/amenity/kindergarten.json b/data/presets/presets/amenity/kindergarten.json
@@ -16,8 +16,8 @@
         "wheelchair"
     ],
     "geometry": [
-        "point",
-        "area"
+        "area",
+        "point"
     ],
     "terms": [
         "kindergarden",

diff --git a/data/presets/presets/amenity/monastery.json b/data/presets/presets/amenity/monastery.json
@@ -15,8 +15,8 @@
         "wheelchair"
     ],
     "geometry": [
-        "point",
-        "area"
+        "area",
+        "point"
     ],
     "terms": [
         "abbey",

diff --git a/data/presets/presets/amenity/parking.json b/data/presets/presets/amenity/parking.json
@@ -27,9 +27,9 @@
         "wheelchair"
     ],
     "geometry": [
+        "area",
         "point",
-        "vertex",
-        "area"
+        "vertex"
     ],
     "tags": {
         "amenity": "parking"

diff --git a/data/presets/presets/amenity/parking/park_ride.json b/data/presets/presets/amenity/parking/park_ride.json
@@ -1,9 +1,9 @@
 {
     "icon": "maki-car",
     "geometry": [
+        "area",
         "point",
-        "vertex",
-        "area"
+        "vertex"
     ],
     "tags": {
         "amenity": "parking",

diff --git a/data/presets/presets/amenity/parking/underground.json b/data/presets/presets/amenity/parking/underground.json
@@ -5,9 +5,9 @@
         "layer"
     ],
     "geometry": [
+        "area",
         "point",
-        "vertex",
-        "area"
+        "vertex"
     ],
     "tags": {
         "amenity": "parking",

diff --git a/data/presets/presets/amenity/parking_space.json b/data/presets/presets/amenity/parking_space.json
@@ -3,9 +3,9 @@
         "capacity"
     ],
     "geometry": [
+        "area",
         "point",
-        "vertex",
-        "area"
+        "vertex"
     ],
     "terms": [],
     "tags": {

diff --git a/data/presets/presets/amenity/prison.json b/data/presets/presets/amenity/prison.json
@@ -14,8 +14,8 @@
         "wheelchair"
     ],
     "geometry": [
-        "point",
-        "area"
+        "area",
+        "point"
     ],
     "terms": [
         "cell",

diff --git a/data/presets/presets/amenity/school.json b/data/presets/presets/amenity/school.json
@@ -21,8 +21,8 @@
         "wheelchair"
     ],
     "geometry": [
-        "point",
-        "area"
+        "area",
+        "point"
     ],
     "terms": [
         "academy",

diff --git a/data/presets/presets/amenity/university.json b/data/presets/presets/amenity/university.json
@@ -7,8 +7,8 @@
         "{amenity/college}"
     ],
     "geometry": [
-        "point",
-        "area"
+        "area",
+        "point"
     ],
     "terms": [
         "college",

diff --git a/data/presets/presets/amenity/water_point.json b/data/presets/presets/amenity/water_point.json
@@ -8,9 +8,9 @@
         "opening_hours"
     ],
     "geometry": [
-        "area",
+        "point",
         "vertex",
-        "point"
+        "area"
     ],
     "tags": {
         "amenity": "water_point"

diff --git a/data/presets/presets/amenity/watering_place.json b/data/presets/presets/amenity/watering_place.json
@@ -8,9 +8,9 @@
         "opening_hours"
     ],
     "geometry": [
-        "area",
+        "point",
         "vertex",
-        "point"
+        "area"
     ],
     "tags": {
         "amenity": "watering_place"

diff --git a/data/presets/presets/leisure/park.json b/data/presets/presets/leisure/park.json
@@ -15,8 +15,8 @@
         "fax"
     ],
     "geometry": [
-        "point",
-        "area"
+        "area",
+        "point"
     ],
     "terms": [
         "esplanade",

diff --git a/data/presets/presets/leisure/swimming_pool.json b/data/presets/presets/leisure/swimming_pool.json
@@ -14,8 +14,8 @@
         "operator"
     ],
     "geometry": [
-        "point",
-        "area"
+        "area",
+        "point"
     ],
     "terms": [
         "dive",

diff --git a/data/presets/presets/man_made/storage_tank.json b/data/presets/presets/man_made/storage_tank.json
@@ -14,8 +14,8 @@
         "manufacturer"
     ],
     "geometry": [
-        "point",
-        "area"
+        "area",
+        "point"
     ],
     "terms": [
         "water",

diff --git a/data/presets/presets/man_made/water_tower.json b/data/presets/presets/man_made/water_tower.json
@@ -5,8 +5,8 @@
         "height"
     ],
     "geometry": [
-        "point",
-        "area"
+        "area",
+        "point"
     ],
     "tags": {
         "man_made": "water_tower"

diff --git a/data/presets/presets/natural/reef.json b/data/presets/presets/natural/reef.json
@@ -1,8 +1,8 @@
 {
     "icon": "temaki-beach",
     "geometry": [
-        "point",
-        "area"
+        "area",
+        "point"
     ],
     "tags": {
         "natural": "reef"

diff --git a/data/presets/presets/natural/wood.json b/data/presets/presets/natural/wood.json
@@ -6,8 +6,8 @@
         "leaf_cycle"
     ],
     "geometry": [
-        "point",
-        "area"
+        "area",
+        "point"
     ],
     "tags": {
         "natural": "wood"

diff --git a/data/presets/presets/waterway/water_point.json b/data/presets/presets/waterway/water_point.json
@@ -1,9 +1,9 @@
 {
      "icon": "maki-drinking-water",
      "geometry": [
-        "area",
-        "vertex",
-        "point"
+         "point",
+         "vertex",
+         "area"
     ],
     "tags": {
         "waterway": "water_point"