Add rock/stone icons

(re: #6311)

data/presets/presets.json

@@ -741,14 +741,14 @@
     "natural/peak": {"icon": "maki-mountain", "fields": ["name", "elevation"], "geometry": ["point", "vertex"], "tags": {"natural": "peak"}, "terms": ["acme", "aiguille", "alp", "climax", "crest", "crown", "hill", "mount", "mountain", "pinnacle", "summit", "tip", "top"], "name": "Peak"},
     "natural/reef": {"icon": "temaki-beach", "geometry": ["point", "area"], "tags": {"natural": "reef"}, "terms": ["barrier", "coral", "ocean", "sand", "shoal"], "name": "Reef"},
     "natural/ridge": {"geometry": ["line"], "tags": {"natural": "ridge"}, "terms": ["crest"], "name": "Ridge"},
-    "natural/rock": {"fields": ["name"], "geometry": ["point", "area"], "tags": {"natural": "rock"}, "terms": ["boulder", "stone", "rock"], "name": "Attached Rock / Boulder"},
+    "natural/rock": {"icon": "temaki-boulder2", "fields": ["name"], "geometry": ["point", "area"], "tags": {"natural": "rock"}, "terms": ["boulder", "stone", "rock"], "name": "Attached Rock / Boulder"},
     "natural/saddle": {"icon": "maki-triangle-stroked", "fields": ["elevation"], "geometry": ["point", "vertex"], "tags": {"natural": "saddle"}, "terms": ["pass", "mountain pass", "top"], "name": "Saddle"},
     "natural/sand": {"geometry": ["area"], "tags": {"natural": "sand"}, "terms": ["desert"], "name": "Sand"},
     "natural/scree": {"geometry": ["area"], "tags": {"natural": "scree"}, "terms": ["loose rocks"], "name": "Scree"},
     "natural/scrub": {"geometry": ["area"], "tags": {"natural": "scrub"}, "terms": ["bush", "shrubs"], "name": "Scrub"},
     "natural/shingle": {"geometry": ["area"], "tags": {"natural": "shingle"}, "terms": ["beach", "gravel", "pebbles", "riverbed", "rounded rock fragments"], "name": "Shingle"},
     "natural/spring": {"icon": "maki-water", "fields": ["name", "intermittent"], "geometry": ["point", "vertex"], "tags": {"natural": "spring"}, "terms": [], "name": "Spring"},
-    "natural/stone": {"fields": ["name"], "geometry": ["point", "area"], "tags": {"natural": "stone"}, "terms": ["boulder", "stone", "rock"], "name": "Unattached Stone / Boulder"},
+    "natural/stone": {"icon": "temaki-boulder1", "fields": ["name"], "geometry": ["point", "area"], "tags": {"natural": "stone"}, "terms": ["boulder", "stone", "rock"], "name": "Unattached Stone / Boulder"},
     "natural/tree_row": {"icon": "maki-park", "fields": ["leaf_type", "leaf_cycle", "denotation"], "geometry": ["line"], "tags": {"natural": "tree_row"}, "terms": [], "name": "Tree Row"},
     "natural/tree": {"icon": "maki-park", "fields": ["leaf_type_singular", "leaf_cycle_singular", "denotation"], "geometry": ["point", "vertex"], "tags": {"natural": "tree"}, "terms": [], "name": "Tree"},
     "natural/valley": {"icon": "maki-triangle-stroked", "fields": ["name", "elevation", "description"], "geometry": ["vertex", "point", "line"], "tags": {"natural": "valley"}, "terms": ["canyon", "dale", "dell", "dene", "depression", "glen", "gorge", "gully", "gulley", "gultch", "hollow", "ravine", "rift", "vale"], "name": "Valley"},

data/presets/presets/natural/rock.json

@@ -1,4 +1,5 @@
 {
+    "icon": "temaki-boulder2",
     "fields": [
         "name"
     ],

data/presets/presets/natural/stone.json

@@ -1,4 +1,5 @@
 {
+    "icon": "temaki-boulder1",
     "fields": [
         "name"
     ],

data/taginfo.json

@@ -713,13 +713,13 @@
     {"key": "natural", "value": "peak", "description": "🄿 Peak", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/mountain-15.svg?sanitize=true"},
     {"key": "natural", "value": "reef", "description": "🄿 Reef", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/beach.svg?sanitize=true"},
     {"key": "natural", "value": "ridge", "description": "🄿 Ridge", "object_types": ["way"]},
-    {"key": "natural", "value": "rock", "description": "🄿 Attached Rock / Boulder", "object_types": ["node", "area"]},
+    {"key": "natural", "value": "rock", "description": "🄿 Attached Rock / Boulder", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/boulder2.svg?sanitize=true"},
     {"key": "natural", "value": "saddle", "description": "🄿 Saddle", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/triangle-stroked-15.svg?sanitize=true"},
     {"key": "natural", "value": "scree", "description": "🄿 Scree", "object_types": ["area"]},
     {"key": "natural", "value": "scrub", "description": "🄿 Scrub", "object_types": ["area"]},
     {"key": "natural", "value": "shingle", "description": "🄿 Shingle", "object_types": ["area"]},
     {"key": "natural", "value": "spring", "description": "🄿 Spring", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/water-15.svg?sanitize=true"},
-    {"key": "natural", "value": "stone", "description": "🄿 Unattached Stone / Boulder", "object_types": ["node", "area"]},
+    {"key": "natural", "value": "stone", "description": "🄿 Unattached Stone / Boulder", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/boulder1.svg?sanitize=true"},
     {"key": "natural", "value": "tree_row", "description": "🄿 Tree Row", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/park-15.svg?sanitize=true"},
     {"key": "natural", "value": "tree", "description": "🄿 Tree", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/park-15.svg?sanitize=true"},
     {"key": "natural", "value": "valley", "description": "🄿 Valley", "object_types": ["node", "way"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/triangle-stroked-15.svg?sanitize=true"},