7 files changed, 1126 insertions, 181 deletions

diff --git a/data/classificator.txt b/data/classificator.txt
index 2024f7ee4e..d571e0e817 100644
--- a/data/classificator.txt
+++ b/data/classificator.txt
@@ -149,6 +149,19 @@ world  +
             underground  -
             {}
         {}
+    craft  +
+        brewery  -
+        carpenter  -
+        electrician  -
+        gardener  -
+        hvac  -
+        metal_construction  -
+        painter  -
+        photographer  -
+        plumber  -
+        shoemaker  -
+        tailor  -
+        {}
     earthquake:damage  +
         spontaneous_camp  -
         {}
@@ -386,11 +399,7 @@ world  +
         playing_fields  +
             tennis  -
             {}
-        recreation_ground  +
-            no-access  -
-            permissive  -
-            private  -
-            {}
+        recreation_ground  -
         slipway  -
         sports_centre  -
         stadium  -
@@ -427,8 +436,10 @@ world  +
         bunker  -
         {}
     natural  +
+        bare_rock  -
         bay  -
         beach  -
+        cape  -
         cave_entrance  -
         cliff  -
         coastline  -
@@ -442,10 +453,12 @@ world  +
         orchard  -
         peak  -
         pond  -
+        rock  -
         salt_pond  -
         scrub  -
         spring  -
         tree  -
+        tree_row  -
         vineyard  -
         volcano  -
         water  -
diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index d187e69333..0233847322 100644
--- a/data/drules_proto.bin
+++ b/data/drules_proto.bin
diff --git a/data/drules_proto.txt b/data/drules_proto.txt
index dbaf3bcb5e..820bc08baf 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -9106,6 +9106,435 @@ cont {
   }
 }
 cont {
+  name: "craft-brewery"
+  element {
+    scale: 17
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15002
+    }
+  }
+  element {
+    scale: 18
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15002
+    }
+  }
+  element {
+    scale: 19
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15002
+    }
+  }
+}
+cont {
+  name: "craft-carpenter"
+  element {
+    scale: 17
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15002
+    }
+  }
+  element {
+    scale: 18
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15002
+    }
+  }
+  element {
+    scale: 19
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15002
+    }
+  }
+}
+cont {
+  name: "craft-electrician"
+  element {
+    scale: 17
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15002
+    }
+  }
+  element {
+    scale: 18
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15002
+    }
+  }
+  element {
+    scale: 19
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15002
+    }
+  }
+}
+cont {
+  name: "craft-gardener"
+  element {
+    scale: 17
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15002
+    }
+  }
+  element {
+    scale: 18
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15002
+    }
+  }
+  element {
+    scale: 19
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15002
+    }
+  }
+}
+cont {
+  name: "craft-hvac"
+  element {
+    scale: 17
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15002
+    }
+  }
+  element {
+    scale: 18
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15002
+    }
+  }
+  element {
+    scale: 19
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15002
+    }
+  }
+}
+cont {
+  name: "craft-metal_construction"
+  element {
+    scale: 17
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15002
+    }
+  }
+  element {
+    scale: 18
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15002
+    }
+  }
+  element {
+    scale: 19
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15002
+    }
+  }
+}
+cont {
+  name: "craft-painter"
+  element {
+    scale: 17
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15002
+    }
+  }
+  element {
+    scale: 18
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15002
+    }
+  }
+  element {
+    scale: 19
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15002
+    }
+  }
+}
+cont {
+  name: "craft-photographer"
+  element {
+    scale: 17
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15002
+    }
+  }
+  element {
+    scale: 18
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15002
+    }
+  }
+  element {
+    scale: 19
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15002
+    }
+  }
+}
+cont {
+  name: "craft-plumber"
+  element {
+    scale: 17
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15002
+    }
+  }
+  element {
+    scale: 18
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15002
+    }
+  }
+  element {
+    scale: 19
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15002
+    }
+  }
+}
+cont {
+  name: "craft-shoemaker"
+  element {
+    scale: 17
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15002
+    }
+  }
+  element {
+    scale: 18
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15002
+    }
+  }
+  element {
+    scale: 19
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15002
+    }
+  }
+}
+cont {
+  name: "craft-tailor"
+  element {
+    scale: 17
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15002
+    }
+  }
+  element {
+    scale: 18
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15002
+    }
+  }
+  element {
+    scale: 19
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15002
+    }
+  }
+}
+cont {
   name: "earthquake:damage-spontaneous_camp"
   element {
     scale: 14
@@ -37994,6 +38423,100 @@ cont {
   }
 }
 cont {
+  name: "leisure-recreation_ground"
+  element {
+    scale: 12
+    area {
+      color: 14544588
+      priority: -16271
+    }
+  }
+  element {
+    scale: 13
+    area {
+      color: 14544588
+      priority: -16272
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 14544588
+      priority: -16273
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 14544588
+      priority: -16274
+    }
+    caption {
+      primary {
+        height: 12
+        color: 2236962
+      }
+      priority: 15000
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 14544588
+      priority: -16275
+    }
+    caption {
+      primary {
+        height: 16
+        color: 2236962
+      }
+      priority: 15000
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 14544588
+      priority: -16276
+    }
+    caption {
+      primary {
+        height: 16
+        color: 2236962
+      }
+      priority: 15000
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 14544588
+      priority: -16277
+    }
+    caption {
+      primary {
+        height: 16
+        color: 2236962
+      }
+      priority: 15000
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 14544588
+      priority: -16278
+    }
+    caption {
+      primary {
+        height: 16
+        color: 2236962
+      }
+      priority: 15000
+    }
+  }
+}
+cont {
   name: "leisure-slipway"
   element {
     scale: 17
@@ -38023,42 +38546,42 @@ cont {
     scale: 12
     area {
       color: 14544588
-      priority: -16271
+      priority: -16279
     }
   }
   element {
     scale: 13
     area {
       color: 14544588
-      priority: -16272
+      priority: -16280
     }
   }
   element {
     scale: 14
     area {
       color: 14544588
-      priority: -16273
+      priority: -16281
     }
   }
   element {
     scale: 15
     area {
       color: 14544588
-      priority: -16274
+      priority: -16282
     }
   }
   element {
     scale: 16
     area {
       color: 14544588
-      priority: -16275
+      priority: -16283
     }
   }
   element {
     scale: 17
     area {
       color: 14544588
-      priority: -16276
+      priority: -16284
     }
     caption {
       primary {
@@ -38073,7 +38596,7 @@ cont {
     scale: 18
     area {
       color: 14544588
-      priority: -16277
+      priority: -16285
     }
     caption {
       primary {
@@ -38088,7 +38611,7 @@ cont {
     scale: 19
     area {
       color: 14544588
-      priority: -16278
+      priority: -16286
     }
     caption {
       primary {
@@ -38106,42 +38629,42 @@ cont {
     scale: 12
     area {
       color: 14544588
-      priority: -16279
+      priority: -16287
     }
   }
   element {
     scale: 13
     area {
       color: 14544588
-      priority: -16280
+      priority: -16288
     }
   }
   element {
     scale: 14
     area {
       color: 14544588
-      priority: -16281
+      priority: -16289
     }
   }
   element {
     scale: 15
     area {
       color: 14544588
-      priority: -16282
+      priority: -16290
     }
   }
   element {
     scale: 16
     area {
       color: 14544588
-      priority: -16283
+      priority: -16291
     }
   }
   element {
     scale: 17
     area {
       color: 14544588
-      priority: -16284
+      priority: -16292
     }
     caption {
       primary {
@@ -38156,7 +38679,7 @@ cont {
     scale: 18
     area {
       color: 14544588
-      priority: -16285
+      priority: -16293
     }
     caption {
       primary {
@@ -38171,7 +38694,7 @@ cont {
     scale: 19
     area {
       color: 14544588
-      priority: -16286
+      priority: -16294
     }
     caption {
       primary {
@@ -38241,56 +38764,56 @@ cont {
     scale: 12
     area {
       color: 14544588
-      priority: -16287
+      priority: -16295
     }
   }
   element {
     scale: 13
     area {
       color: 14544588
-      priority: -16288
+      priority: -16296
     }
   }
   element {
     scale: 14
     area {
       color: 14544588
-      priority: -16289
+      priority: -16297
     }
   }
   element {
     scale: 15
     area {
       color: 14544588
-      priority: -16290
+      priority: -16298
     }
   }
   element {
     scale: 16
     area {
       color: 14544588
-      priority: -16291
+      priority: -16299
     }
   }
   element {
     scale: 17
     area {
       color: 14544588
-      priority: -16292
+      priority: -16300
     }
   }
   element {
     scale: 18
     area {
       color: 14544588
-      priority: -16293
+      priority: -16301
     }
   }
   element {
     scale: 19
     area {
       color: 14544588
-      priority: -16294
+      priority: -16302
     }
   }
 }
@@ -38962,56 +39485,56 @@ cont {
     scale: 12
     area {
       color: 15658734
-      priority: -16295
+      priority: -16303
     }
   }
   element {
     scale: 13
     area {
       color: 15658734
-      priority: -16296
+      priority: -16304
     }
   }
   element {
     scale: 14
     area {
       color: 15658734
-      priority: -16297
+      priority: -16305
     }
   }
   element {
     scale: 15
     area {
       color: 15658734
-      priority: -16298
+      priority: -16306
     }
   }
   element {
     scale: 16
     area {
       color: 15658734
-      priority: -16299
+      priority: -16307
     }
   }
   element {
     scale: 17
     area {
       color: 15658734
-      priority: -16300
+      priority: -16308
     }
   }
   element {
     scale: 18
     area {
       color: 15658734
-      priority: -16301
+      priority: -16309
     }
   }
   element {
     scale: 19
     area {
       color: 15658734
-      priority: -16302
+      priority: -16310
     }
   }
 }
@@ -39444,6 +39967,114 @@ cont {
   }
 }
 cont {
+  name: "natural-bare_rock"
+  element {
+    scale: 13
+    symbol {
+      name: "peak-mini"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 12
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15000
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "peak"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 12
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15000
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "peak"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 12
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15000
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "peak"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 16
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15000
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "peak"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 16
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15000
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "peak"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 16
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15000
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "peak"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 16
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15000
+    }
+  }
+}
+cont {
   name: "natural-bay"
   element {
     scale: 14
@@ -39536,7 +40167,7 @@ cont {
     scale: 14
     area {
       color: 15649877
-      priority: -16303
+      priority: -16311
     }
     caption {
       primary {
@@ -39551,7 +40182,7 @@ cont {
     scale: 15
     area {
       color: 15649877
-      priority: -16304
+      priority: -16312
     }
     caption {
       primary {
@@ -39566,7 +40197,7 @@ cont {
     scale: 16
     area {
       color: 15649877
-      priority: -16305
+      priority: -16313
     }
     caption {
       primary {
@@ -39581,7 +40212,7 @@ cont {
     scale: 17
     area {
       color: 15649877
-      priority: -16306
+      priority: -16314
     }
     caption {
       primary {
@@ -39596,7 +40227,7 @@ cont {
     scale: 18
     area {
       color: 15649877
-      priority: -16307
+      priority: -16315
     }
     caption {
       primary {
@@ -39611,7 +40242,7 @@ cont {
     scale: 19
     area {
       color: 15649877
-      priority: -16308
+      priority: -16316
     }
     caption {
       primary {
@@ -39624,6 +40255,75 @@ cont {
   }
 }
 cont {
+  name: "natural-cape"
+  element {
+    scale: 14
+    caption {
+      primary {
+        height: 12
+        color: 2236962
+        offset_y: 10
+      }
+      priority: 15000
+    }
+  }
+  element {
+    scale: 15
+    caption {
+      primary {
+        height: 12
+        color: 2236962
+        offset_y: 10
+      }
+      priority: 15000
+    }
+  }
+  element {
+    scale: 16
+    caption {
+      primary {
+        height: 16
+        color: 2236962
+        offset_y: 10
+      }
+      priority: 15000
+    }
+  }
+  element {
+    scale: 17
+    caption {
+      primary {
+        height: 16
+        color: 2236962
+        offset_y: 10
+      }
+      priority: 15000
+    }
+  }
+  element {
+    scale: 18
+    caption {
+      primary {
+        height: 16
+        color: 2236962
+        offset_y: 10
+      }
+      priority: 15000
+    }
+  }
+  element {
+    scale: 19
+    caption {
+      primary {
+        height: 16
+        color: 2236962
+        offset_y: 10
+      }
+      priority: 15000
+    }
+  }
+}
+cont {
   name: "natural-cave_entrance"
   element {
     scale: 14
@@ -39865,70 +40565,70 @@ cont {
     scale: 10
     area {
       color: 11197934
-      priority: -16309
+      priority: -16317
     }
   }
   element {
     scale: 11
     area {
       color: 11197934
-      priority: -16310
+      priority: -16318
     }
   }
   element {
     scale: 12
     area {
       color: 11197934
-      priority: -16311
+      priority: -16319
     }
   }
   element {
     scale: 13
     area {
       color: 11197934
-      priority: -16312
+      priority: -16320
     }
   }
   element {
     scale: 14
     area {
       color: 11197934
-      priority: -16313
+      priority: -16321
     }
   }
   element {
     scale: 15
     area {
       color: 11197934
-      priority: -16314
+      priority: -16322
     }
   }
   element {
     scale: 16
     area {
       color: 11197934
-      priority: -16315
+      priority: -16323
     }
   }
   element {
     scale: 17
     area {
       color: 11197934
-      priority: -16316
+      priority: -16324
     }
   }
   element {
     scale: 18
     area {
       color: 11197934
-      priority: -16317
+      priority: -16325
     }
   }
   element {
     scale: 19
     area {
       color: 11197934
-      priority: -16318
+      priority: -16326
     }
   }
 }
@@ -39938,28 +40638,28 @@ cont {
     scale: 12
     area {
       color: 14544588
-      priority: -16319
+      priority: -16327
     }
   }
   element {
     scale: 13
     area {
       color: 14544588
-      priority: -16320
+      priority: -16328
     }
   }
   element {
     scale: 14
     area {
       color: 14544588
-      priority: -16321
+      priority: -16329
     }
   }
   element {
     scale: 15
     area {
       color: 14544588
-      priority: -16322
+      priority: -16330
     }
     caption {
       primary {
@@ -39973,7 +40673,7 @@ cont {
     scale: 16
     area {
       color: 14544588
-      priority: -16323
+      priority: -16331
     }
     caption {
       primary {
@@ -39987,7 +40687,7 @@ cont {
     scale: 17
     area {
       color: 14544588
-      priority: -16324
+      priority: -16332
     }
     caption {
       primary {
@@ -40001,7 +40701,7 @@ cont {
     scale: 18
     area {
       color: 14544588
-      priority: -16325
+      priority: -16333
     }
     caption {
       primary {
@@ -40015,7 +40715,7 @@ cont {
     scale: 19
     area {
       color: 14544588
-      priority: -16326
+      priority: -16334
     }
     caption {
       primary {
@@ -40638,6 +41338,121 @@ cont {
   }
 }
 cont {
+  name: "natural-rock"
+  element {
+    scale: 12
+    symbol {
+      name: "peak-mini"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "peak-mini"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 12
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15000
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "peak"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 12
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15000
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "peak"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 12
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15000
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "peak"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 16
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15000
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "peak"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 16
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15000
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "peak"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 16
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15000
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "peak"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 16
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15000
+    }
+  }
+}
+cont {
   name: "natural-salt_pond"
   element {
     scale: 15
@@ -40696,56 +41511,56 @@ cont {
     scale: 12
     area {
       color: 14544588
-      priority: -16327
+      priority: -16335
     }
   }
   element {
     scale: 13
     area {
       color: 14544588
-      priority: -16328
+      priority: -16336
     }
   }
   element {
     scale: 14
     area {
       color: 14544588
-      priority: -16329
+      priority: -16337
     }
   }
   element {
     scale: 15
     area {
       color: 14544588
-      priority: -16330
+      priority: -16338
     }
   }
   element {
     scale: 16
     area {
       color: 14544588
-      priority: -16331
+      priority: -16339
     }
   }
   element {
     scale: 17
     area {
       color: 14544588
-      priority: -16332
+      priority: -16340
     }
   }
   element {
     scale: 18
     area {
       color: 14544588
-      priority: -16333
+      priority: -16341
     }
   }
   element {
     scale: 19
     area {
       color: 14544588
-      priority: -16334
+      priority: -16342
     }
   }
 }
@@ -40890,6 +41705,61 @@ cont {
   }
 }
 cont {
+  name: "natural-tree_row"
+  element {
+    scale: 16
+    lines {
+      width: 0
+      color: 0
+      priority: 1000
+      pathsym {
+        name: "tree"
+        step: 84.0
+        offset: 0
+      }
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 0
+      color: 0
+      priority: 1000
+      pathsym {
+        name: "tree"
+        step: 84.0
+        offset: 0
+      }
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 0
+      color: 0
+      priority: 1000
+      pathsym {
+        name: "tree"
+        step: 84.0
+        offset: 0
+      }
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 0
+      color: 0
+      priority: 1000
+      pathsym {
+        name: "tree"
+        step: 84.0
+        offset: 0
+      }
+    }
+  }
+}
+cont {
   name: "natural-vineyard"
   element {
     scale: 15
@@ -41290,42 +42160,42 @@ cont {
     scale: 14
     area {
       color: 11193531
-      priority: -16335
+      priority: -16343
     }
   }
   element {
     scale: 15
     area {
       color: 11193531
-      priority: -16336
+      priority: -16344
     }
   }
   element {
     scale: 16
     area {
       color: 11193531
-      priority: -16337
+      priority: -16345
     }
   }
   element {
     scale: 17
     area {
       color: 11193531
-      priority: -16338
+      priority: -16346
     }
   }
   element {
     scale: 18
     area {
       color: 11193531
-      priority: -16339
+      priority: -16347
     }
   }
   element {
     scale: 19
     area {
       color: 11193531
-      priority: -16340
+      priority: -16348
     }
   }
 }
@@ -41335,56 +42205,56 @@ cont {
     scale: 12
     area {
       color: 11193531
-      priority: -16341
+      priority: -16349
     }
   }
   element {
     scale: 13
     area {
       color: 11193531
-      priority: -16342
+      priority: -16350
     }
   }
   element {
     scale: 14
     area {
       color: 11193531
-      priority: -16343
+      priority: -16351
     }
   }
   element {
     scale: 15
     area {
       color: 11193531
-      priority: -16344
+      priority: -16352
     }
   }
   element {
     scale: 16
     area {
       color: 11193531
-      priority: -16345
+      priority: -16353
     }
   }
   element {
     scale: 17
     area {
       color: 11193531
-      priority: -16346
+      priority: -16354
     }
   }
   element {
     scale: 18
     area {
       color: 11193531
-      priority: -16347
+      priority: -16355
     }
   }
   element {
     scale: 19
     area {
       color: 11193531
-      priority: -16348
+      priority: -16356
     }
   }
 }
@@ -41394,70 +42264,70 @@ cont {
     scale: 10
     area {
       color: 12311978
-      priority: -16349
+      priority: -16357
     }
   }
   element {
     scale: 11
     area {
       color: 12311978
-      priority: -16350
+      priority: -16358
     }
   }
   element {
     scale: 12
     area {
       color: 12311978
-      priority: -16351
+      priority: -16359
     }
   }
   element {
     scale: 13
     area {
       color: 12311978
-      priority: -16352
+      priority: -16360
     }
   }
   element {
     scale: 14
     area {
       color: 12311978
-      priority: -16353
+      priority: -16361
     }
   }
   element {
     scale: 15
     area {
       color: 12311978
-      priority: -16354
+      priority: -16362
     }
   }
   element {
     scale: 16
     area {
       color: 12311978
-      priority: -16355
+      priority: -16363
     }
   }
   element {
     scale: 17
     area {
       color: 12311978
-      priority: -16356
+      priority: -16364
     }
   }
   element {
     scale: 18
     area {
       color: 12311978
-      priority: -16357
+      priority: -16365
     }
   }
   element {
     scale: 19
     area {
       color: 12311978
-      priority: -16358
+      priority: -16366
     }
   }
 }
@@ -41467,70 +42337,70 @@ cont {
     scale: 10
     area {
       color: 12311978
-      priority: -16359
+      priority: -16367
     }
   }
   element {
     scale: 11
     area {
       color: 12311978
-      priority: -16360
+      priority: -16368
     }
   }
   element {
     scale: 12
     area {
       color: 12311978
-      priority: -16361
+      priority: -16369
     }
   }
   element {
     scale: 13
     area {
       color: 12311978
-      priority: -16362
+      priority: -16370
     }
   }
   element {
     scale: 14
     area {
       color: 12311978
-      priority: -16363
+      priority: -16371
     }
   }
   element {
     scale: 15
     area {
       color: 12311978
-      priority: -16364
+      priority: -16372
     }
   }
   element {
     scale: 16
     area {
       color: 12311978
-      priority: -16365
+      priority: -16373
     }
   }
   element {
     scale: 17
     area {
       color: 12311978
-      priority: -16366
+      priority: -16374
     }
   }
   element {
     scale: 18
     area {
       color: 12311978
-      priority: -16367
+      priority: -16375
     }
   }
   element {
     scale: 19
     area {
       color: 12311978
-      priority: -16368
+      priority: -16376
     }
   }
 }
@@ -41540,70 +42410,70 @@ cont {
     scale: 10
     area {
       color: 12311978
-      priority: -16369
+      priority: -16377
     }
   }
   element {
     scale: 11
     area {
       color: 12311978
-      priority: -16370
+      priority: -16378
     }
   }
   element {
     scale: 12
     area {
       color: 12311978
-      priority: -16371
+      priority: -16379
     }
   }
   element {
     scale: 13
     area {
       color: 12311978
-      priority: -16372
+      priority: -16380
     }
   }
   element {
     scale: 14
     area {
       color: 12311978
-      priority: -16373
+      priority: -16381
     }
   }
   element {
     scale: 15
     area {
       color: 12311978
-      priority: -16374
+      priority: -16382
     }
   }
   element {
     scale: 16
     area {
       color: 12311978
-      priority: -16375
+      priority: -16383
     }
   }
   element {
     scale: 17
     area {
       color: 12311978
-      priority: -16376
+      priority: -16384
     }
   }
   element {
     scale: 18
     area {
       color: 12311978
-      priority: -16377
+      priority: -16385
     }
   }
   element {
     scale: 19
     area {
       color: 12311978
-      priority: -16378
+      priority: -16386
     }
   }
 }
@@ -41613,70 +42483,70 @@ cont {
     scale: 10
     area {
       color: 12311978
-      priority: -16379
+      priority: -16387
     }
   }
   element {
     scale: 11
     area {
       color: 12311978
-      priority: -16380
+      priority: -16388
     }
   }
   element {
     scale: 12
     area {
       color: 12311978
-      priority: -16381
+      priority: -16389
     }
   }
   element {
     scale: 13
     area {
       color: 12311978
-      priority: -16382
+      priority: -16390
     }
   }
   element {
     scale: 14
     area {
       color: 12311978
-      priority: -16383
+      priority: -16391
     }
   }
   element {
     scale: 15
     area {
       color: 12311978
-      priority: -16384
+      priority: -16392
     }
   }
   element {
     scale: 16
     area {
       color: 12311978
-      priority: -16385
+      priority: -16393
     }
   }
   element {
     scale: 17
     area {
       color: 12311978
-      priority: -16386
+      priority: -16394
     }
   }
   element {
     scale: 18
     area {
       color: 12311978
-      priority: -16387
+      priority: -16395
     }
   }
   element {
     scale: 19
     area {
       color: 12311978
-      priority: -16388
+      priority: -16396
     }
   }
 }
@@ -43843,7 +44713,7 @@ cont {
     scale: 14
     area {
       color: 14540236
-      priority: -16389
+      priority: -16397
     }
     caption {
       primary {
@@ -43857,7 +44727,7 @@ cont {
     scale: 15
     area {
       color: 14540236
-      priority: -16390
+      priority: -16398
     }
     caption {
       primary {
@@ -43871,7 +44741,7 @@ cont {
     scale: 16
     area {
       color: 14540236
-      priority: -16391
+      priority: -16399
     }
     caption {
       primary {
@@ -43885,7 +44755,7 @@ cont {
     scale: 17
     area {
       color: 14540236
-      priority: -16392
+      priority: -16400
     }
     caption {
       primary {
@@ -43899,7 +44769,7 @@ cont {
     scale: 18
     area {
       color: 14540236
-      priority: -16393
+      priority: -16401
     }
     caption {
       primary {
@@ -43913,7 +44783,7 @@ cont {
     scale: 19
     area {
       color: 14540236
-      priority: -16394
+      priority: -16402
     }
     caption {
       primary {
@@ -45078,14 +45948,14 @@ cont {
     scale: 11
     area {
       color: 14540236
-      priority: -16395
+      priority: -16403
     }
   }
   element {
     scale: 12
     area {
       color: 14540236
-      priority: -16396
+      priority: -16404
     }
     caption {
       primary {
@@ -45100,7 +45970,7 @@ cont {
     scale: 13
     area {
       color: 14540236
-      priority: -16397
+      priority: -16405
     }
     caption {
       primary {
@@ -45121,7 +45991,7 @@ cont {
     scale: 14
     area {
       color: 14540236
-      priority: -16398
+      priority: -16406
     }
     caption {
       primary {
@@ -45142,7 +46012,7 @@ cont {
     scale: 15
     area {
       color: 14540236
-      priority: -16399
+      priority: -16407
     }
     caption {
       primary {
@@ -45163,7 +46033,7 @@ cont {
     scale: 16
     area {
       color: 14540236
-      priority: -16400
+      priority: -16408
     }
     caption {
       primary {
@@ -45184,7 +46054,7 @@ cont {
     scale: 17
     area {
       color: 14540236
-      priority: -16401
+      priority: -16409
     }
     caption {
       primary {
@@ -45205,7 +46075,7 @@ cont {
     scale: 18
     area {
       color: 14540236
-      priority: -16402
+      priority: -16410
     }
     caption {
       primary {
@@ -45226,7 +46096,7 @@ cont {
     scale: 19
     area {
       color: 14540236
-      priority: -16403
+      priority: -16411
     }
     caption {
       primary {
@@ -59390,21 +60260,21 @@ cont {
     scale: 12
     area {
       color: 13430459
-      priority: -16404
+      priority: -16412
     }
   }
   element {
     scale: 13
     area {
       color: 13430459
-      priority: -16405
+      priority: -16413
     }
   }
   element {
     scale: 14
     area {
       color: 13430459
-      priority: -16406
+      priority: -16414
     }
     symbol {
       name: "campsite"
@@ -59415,7 +60285,7 @@ cont {
     scale: 15
     area {
       color: 13430459
-      priority: -16407
+      priority: -16415
     }
     symbol {
       name: "campsite"
@@ -59426,7 +60296,7 @@ cont {
     scale: 16
     area {
       color: 13430459
-      priority: -16408
+      priority: -16416
     }
     symbol {
       name: "campsite"
@@ -59500,35 +60370,35 @@ cont {
     scale: 12
     area {
       color: 13430459
-      priority: -16409
+      priority: -16417
     }
   }
   element {
     scale: 13
     area {
       color: 13430459
-      priority: -16410
+      priority: -16418
     }
   }
   element {
     scale: 14
     area {
       color: 13430459
-      priority: -16411
+      priority: -16419
     }
   }
   element {
     scale: 15
     area {
       color: 13430459
-      priority: -16412
+      priority: -16420
     }
   }
   element {
     scale: 16
     area {
       color: 13430459
-      priority: -16413
+      priority: -16421
     }
   }
   element {
@@ -60029,35 +60899,35 @@ cont {
     scale: 12
     area {
       color: 13430459
-      priority: -16414
+      priority: -16422
     }
   }
   element {
     scale: 13
     area {
       color: 13430459
-      priority: -16415
+      priority: -16423
     }
   }
   element {
     scale: 14
     area {
       color: 13430459
-      priority: -16416
+      priority: -16424
     }
   }
   element {
     scale: 15
     area {
       color: 13430459
-      priority: -16417
+      priority: -16425
     }
   }
   element {
     scale: 16
     area {
       color: 13430459
-      priority: -16418
+      priority: -16426
     }
   }
   element {
@@ -60192,35 +61062,35 @@ cont {
     scale: 12
     area {
       color: 13430459
-      priority: -16419
+      priority: -16427
     }
   }
   element {
     scale: 13
     area {
       color: 13430459
-      priority: -16420
+      priority: -16428
     }
   }
   element {
     scale: 14
     area {
       color: 13430459
-      priority: -16421
+      priority: -16429
     }
   }
   element {
     scale: 15
     area {
       color: 13430459
-      priority: -16422
+      priority: -16430
     }
   }
   element {
     scale: 16
     area {
       color: 13430459
-      priority: -16423
+      priority: -16431
     }
   }
   element {
diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv
index 8ed4871d5b..1ab2945871 100644
--- a/data/mapcss-mapping.csv
+++ b/data/mapcss-mapping.csv
@@ -357,7 +357,7 @@ amenity|parking|underground|fee;[amenity=parking][location=underground][fee?];;n
 amenity|parking|underground;[amenity=parking][location=underground];;name;int_name;357;
 man_made|pipeline|gas;[man_made=pipeline][gas];x;name;int_name;358;man_made|pipeline
 amenity|parking|multi-storey;[amenity=parking][parking=multi-storey];;name;int_name;359;
-leisure|recreation_ground|private;[leisure=recreation_ground][access=private];;name;int_name;360;
+leisure|recreation_ground;[leisure=recreation_ground];;name;int_name;360;
 highway|footway|mountain_hiking;[highway=footway][sac_scale=mountain_hiking];;name;int_name;361;
 highway|service|driveway|bridge;[highway=service][service=driveway][bridge?];;name;int_name;362;
 amenity|parking|multi-storey|fee;[amenity=parking][parking=multi-storey][fee?];;name;int_name;363;
@@ -661,7 +661,7 @@ natural|construction;[natural][construction?];x;name;int_name;660;
 communication|line;[communication=line];;name;int_name;661;
 highway|tertiary_link|motorroad;[highway=tertiary_link][motorroad?];x;name;int_name;662;highway|tertiary_link
 railway|dismantled|tunnel;[railway=dismantled][tunnel?];x;name;int_name;663;
-leisure|recreation_ground|permissive;[leisure=recreation_ground][access=permissive];;name;int_name;664;
+leisure|recreation_ground|permissive;[leisure=recreation_ground][access=permissive];x;name;int_name;664;leisure|recreation_ground
 railway|yard|bridge;[railway=yard][bridge?];;name;int_name;665;
 landuse|raceway|dismantled;[landuse=raceway][dismantled?];x;name;int_name;666;
 railway|planned|tunnel;[railway=planned][tunnel?];x;name;int_name;667;
@@ -846,8 +846,8 @@ landuse|scrub|mixed;[landuse=scrub][wood=mixed];x;name;int_name;845;
 leisure|dog_park|tennis;[leisure=dog_park][sport=tennis];;name;int_name;846;
 leisure|park|no-access;[leisure=park][access=no];;name;int_name;847;
 leisure|playing_fields|tennis;[leisure=playing_fields][sport=tennis];;name;int_name;848;
-leisure|recreation_ground|destination;[leisure=recreation_ground][access=destination];x;name;int_name;849;
-leisure|recreation_ground|no-access;[leisure=recreation_ground][access=no];;name;int_name;850;
+leisure|recreation_ground|private;[leisure=recreation_ground][access=private];x;name;int_name;849;leisure|recreation_ground
+leisure|recreation_ground|no-access;[leisure=recreation_ground][access=no];x;name;int_name;850;leisure|recreation_ground
 man_made|pipeline|gas|overground;[man_made=pipeline][type=gas][location=overground];x;name;int_name;851;man_made|pipeline
 man_made|pipeline|heat|overground;[man_made=pipeline][type=heat][location=overground];x;name;int_name;852;man_made|pipeline
 man_made|pipeline|hot_water|overground;[man_made=pipeline][type=hot_water][location=overground];x;name;int_name;853;man_made|pipeline
@@ -966,3 +966,18 @@ historic|wayside_shrine;[historic=wayside_shrine];;name;int_name;965;
 historic|boundary_stone;[historic=boundary_stone];;name;int_name;966;
 historic|citywalls;[historic=citywalls];;name;int_name;967;
 historic|tomb;[historic=tomb];;name;int_name;968;
+natural|rock;[natural=rock];;name;int_name;969;
+natural|bare_rock;[natural=bare_rock];;name;int_name;970;
+natural|tree_row;[natural=tree_row];;name;int_name;971;
+natural|cape;[natural=cape];;name;int_name;972;
+craft|carpenter;[craft=carpenter];;name;int_name;973;
+craft|shoemaker;[craft=shoemaker];;name;int_name;974;
+craft|photographer;[craft=photographer];;name;int_name;975;
+craft|electrician;[craft=electrician];;name;int_name;976;
+craft|tailor;[craft=tailor];;name;int_name;977;
+craft|plumber;[craft=plumber];;name;int_name;978;
+craft|brewery;[craft=brewery];;name;int_name;979;
+craft|metal_construction;[craft=metal_construction];;name;int_name;980;
+craft|hvac;[craft=hvac];;name;int_name;981;
+craft|painter;[craft=painter];;name;int_name;982;
+craft|gardener;[craft=gardener];;name;int_name;983;
diff --git a/data/styles/include/base_landuse.mapcss b/data/styles/include/base_landuse.mapcss
index 9a355e1cf9..a21cdff045 100644
--- a/data/styles/include/base_landuse.mapcss
+++ b/data/styles/include/base_landuse.mapcss
@@ -1,6 +1,6 @@
 area[landuse],
 area[natural],
-area[leisure]
+area[leisure],
 {
   fill-position: background;
 }
@@ -34,9 +34,10 @@ area|z12-[landuse=field],
 area|z12-[landuse=grass],
 area|z12-[landuse=meadow],
 area|z12-[landuse=recreation_ground],
+area|z12-[leisure=recreation_ground],
 area|z12-[landuse=village_green],
 area|z12-[natural=scrub],
-area|z12-[natural=grassland]
+area|z12-[natural=grassland],
 {
   fill-color: #d0e8c4;
 }
@@ -151,6 +152,7 @@ area|z15[landuse=orchard],
 area|z15[landuse=quarry],
 area|z15[landuse=railway],
 area|z15[landuse=recreation_ground],
+area|z15[leisure=recreation_ground],
 area|z15[landuse=reservoir],
 area|z15[landuse=retail],
 area|z15[landuse=salt_pond],
@@ -165,7 +167,7 @@ area|z15[natural=vineyard],
 node|z17-[aeroway=gate],
 node|z14-15[natural=bay],
 area|z14-[landuse=field],
-area|z15-[landuse=residential]
+area|z15-[landuse=residential],
 {
   text: name;
   font-size: 12;
@@ -181,7 +183,7 @@ area|z17-[leisure=park],
 node|z13-[highway=motorway_junction],
 node|z17-[tourism=caravan_site],
 node|z17-[tourism=zoo],
-node|z16-[amenity=townhall]
+node|z16-[amenity=townhall],
 {
   font-size: 12;
   text-halo-radius: 2;
@@ -211,6 +213,7 @@ area|z16-[landuse=orchard],
 area|z16-[landuse=quarry],
 area|z16-[landuse=railway],
 area|z16-[landuse=recreation_ground],
+area|z16-[leisure=recreation_ground],
 area|z16-[landuse=reservoir],
 area|z16-[landuse=retail],
 area|z16-[landuse=salt_pond],
@@ -243,6 +246,7 @@ node|z16-[landuse=orchard],
 node|z16-[landuse=quarry],
 node|z16-[landuse=railway],
 node|z16-[landuse=recreation_ground],
+node|z16-[leisure=recreation_ground],
 node|z16-[landuse=reservoir],
 node|z16-[landuse=retail],
 node|z16-[landuse=salt_pond],
@@ -253,7 +257,7 @@ node|z16-[natural=grassland],
 node|z16-[natural=meadow],
 node|z16-[natural=orchard],
 node|z16-[natural=salt_pond],
-node|z16-[natural=vineyard]
+node|z16-[natural=vineyard],
 {
   text: name;
   font-size: 16;
diff --git a/data/styles/normal.mapcss b/data/styles/normal.mapcss
index 755681f04b..24776fb420 100644
--- a/data/styles/normal.mapcss
+++ b/data/styles/normal.mapcss
@@ -45,7 +45,8 @@ area::* {
 *[man_made],
 *[natural],
 *[power],
-*[landuse]
+*[landuse],
+*[craft],
 {
   text-position: center
 }
@@ -536,7 +537,11 @@ line|z12[railway=disused]
   opacity: 0.5;
 }
 area|z12-13[natural=peak],
-node|z12-13[natural=peak]
+node|z12-13[natural=peak],
+area|z12-13[natural=rock],
+node|z12-13[natural=rock],
+area|z13-15[natural=bare_rock],
+node|z13-15[natural=bare_rock],
 {
   icon-image: peak-mini.svg;
 }
@@ -688,7 +693,11 @@ node|z13[aerialway=station]
   symbol-size: 2;
 }
 area|z13-15[natural=peak],
-node|z13-15[natural=peak]
+node|z13-15[natural=peak],
+area|z13-15[natural=rock],
+node|z13-15[natural=rock],
+area|z13-15[natural=bare_rock],
+node|z13-15[natural=bare_rock],
 {
   text-offset: 10;
   text: name;
@@ -837,10 +846,12 @@ line|z14[railway=yard]
   width: 1.6;
   z-index: 208;
 }
-area|z14-15[natural=cave_entrance],
 area|z14-15[natural=volcano],
+node|z14-15[natural=volcano],
 node|z14-15[natural=cave_entrance],
-node|z14-15[natural=volcano]
+area|z14-15[natural=cave_entrance],
+node|z14-15[natural=cape],
+area|z14-15[natural=cape],
 {
   text-offset: 10;
   text: name;
@@ -857,7 +868,11 @@ line|z14[railway=abandoned]::d1p3
   dashes: 4.5,4.5;
 }
 area|z14-[natural=peak],
-node|z14-[natural=peak]
+node|z14-[natural=peak],
+area|z14-[natural=rock],
+node|z14-[natural=rock],
+area|z14-[natural=bare_rock],
+node|z14-[natural=bare_rock],
 {
   icon-image: peak.svg;
 }
@@ -2164,10 +2179,12 @@ area|z17-[amenity],
 area|z17-[historic],
 area|z17-[office][office!=no],
 area|z17-[tourism],
+area|z17-[craft],
 node|z17-[amenity],
 node|z17-[historic],
 node|z17-[office][office!=no],
-node|z17-[tourism]
+node|z17-[tourism],
+node|z17-[craft],
 {
   font-size: 11;
   text-halo-radius: 2;
@@ -2266,7 +2283,11 @@ node|z16-[power=pole]
   icon-image: power-pole.svg;
 }
 area|z16-[natural=peak],
-node|z16-[natural=peak]
+node|z16-[natural=peak],
+area|z16-[natural=rock],
+node|z16-[natural=rock],
+area|z16-[natural=bare_rock],
+node|z16-[natural=bare_rock],
 {
   text-offset: 10;
   text: name;
@@ -2444,10 +2465,12 @@ line|z16[boundary=administrative][border_type=suburb]
   z-index: 936;
   dashes: 4,20;
 }
-area|z16-[natural=cave_entrance],
+node|z16-[natural=volcano],
 area|z16-[natural=volcano],
 node|z16-[natural=cave_entrance],
-node|z16-[natural=volcano]
+area|z16-[natural=cave_entrance],
+node|z16-[natural=cape],
+area|z16-[natural=cape],
 {
   text-offset: 10;
   text: name;
@@ -3812,6 +3835,11 @@ line|z16-[oneway?]::arrows
   pattern-image: arrow.svg;
   pattern-spacing: 234;
 }
+line|z16-[natural=tree_row]
+{
+  pattern-image: tree.svg;
+  pattern-spacing: 100;
+}
 
 /* Review roads styles for different access. Opacity == 0 is useless. */
 /*
diff --git a/data/types.txt b/data/types.txt
index 1078a778ce..356102eb0a 100644
--- a/data/types.txt
+++ b/data/types.txt
@@ -357,7 +357,7 @@ amenity|parking|underground|fee
 amenity|parking|underground
 man_made|pipeline
 amenity|parking|multi-storey
-leisure|recreation_ground|private
+leisure|recreation_ground
 highway|footway|mountain_hiking
 highway|service|driveway|bridge
 amenity|parking|multi-storey|fee
@@ -661,7 +661,7 @@ mapswithme
 communication|line
 highway|tertiary_link
 mapswithme
-leisure|recreation_ground|permissive
+leisure|recreation_ground
 railway|yard|bridge
 mapswithme
 mapswithme
@@ -846,8 +846,8 @@ mapswithme
 leisure|dog_park|tennis
 leisure|park|no-access
 leisure|playing_fields|tennis
-mapswithme
-leisure|recreation_ground|no-access
+leisure|recreation_ground
+leisure|recreation_ground
 man_made|pipeline
 man_made|pipeline
 man_made|pipeline
@@ -966,3 +966,18 @@ historic|wayside_shrine
 historic|boundary_stone
 historic|citywalls
 historic|tomb
+natural|rock
+natural|bare_rock
+natural|tree_row
+natural|cape
+craft|carpenter
+craft|shoemaker
+craft|photographer
+craft|electrician
+craft|tailor
+craft|plumber
+craft|brewery
+craft|metal_construction
+craft|hvac
+craft|painter
+craft|gardener