Generated styles

11 files changed, 2098 insertions, 0 deletions

diff --git a/data/classificator.txt b/data/classificator.txt
index 1cdc518d4a..0a22d7b594 100644
--- a/data/classificator.txt
+++ b/data/classificator.txt
@@ -31,7 +31,10 @@ world  +
         cafe  -
         car_rental  -
         car_sharing  -
+        car_wash  -
         casino  -
+        charging_station  -
+        childcare  -
         cinema  -
         clinic  -
         college  -
@@ -97,6 +100,7 @@ world  +
             parking_tickets  -
             public_transport_tickets  -
             {}
+        veterinary  -
         waste_disposal  -
         {}
     area:highway  +
@@ -722,8 +726,10 @@ world  +
         computer  -
         confectionery  -
         convenience  -
+        copyshop  -
         department_store  -
         doityourself  -
+        dry_cleaning  -
         electronics  -
         florist  -
         furniture  -
@@ -738,10 +744,14 @@ world  +
         mall  -
         mobile_phone  -
         optician  -
+        outdoor  -
+        photo  -
         shoes  -
         sports  -
         supermarket  -
         toys  -
+        travel_agency  -
+        tyres  -
         {}
     sport  +
         american_football  -
diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index b3125ceca9..8c2559315e 100644
--- a/data/drules_proto.bin
+++ b/data/drules_proto.bin
diff --git a/data/drules_proto.txt b/data/drules_proto.txt
index 947e61369f..7dc3f791ee 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -2320,6 +2320,45 @@ cont {
   }
 }
 cont {
+  name: "amenity-car_wash"
+  element {
+    scale: 17
+    caption {
+      primary {
+        height: 11
+        color: 4210752
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15003
+    }
+  }
+  element {
+    scale: 18
+    caption {
+      primary {
+        height: 11
+        color: 4210752
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15003
+    }
+  }
+  element {
+    scale: 19
+    caption {
+      primary {
+        height: 11
+        color: 4210752
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15003
+    }
+  }
+}
+cont {
   name: "amenity-casino"
   element {
     scale: 16
@@ -2371,6 +2410,84 @@ cont {
   }
 }
 cont {
+  name: "amenity-charging_station"
+  element {
+    scale: 17
+    caption {
+      primary {
+        height: 11
+        color: 4210752
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15003
+    }
+  }
+  element {
+    scale: 18
+    caption {
+      primary {
+        height: 11
+        color: 4210752
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15003
+    }
+  }
+  element {
+    scale: 19
+    caption {
+      primary {
+        height: 11
+        color: 4210752
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15003
+    }
+  }
+}
+cont {
+  name: "amenity-childcare"
+  element {
+    scale: 17
+    caption {
+      primary {
+        height: 11
+        color: 4210752
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15003
+    }
+  }
+  element {
+    scale: 18
+    caption {
+      primary {
+        height: 11
+        color: 4210752
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15003
+    }
+  }
+  element {
+    scale: 19
+    caption {
+      primary {
+        height: 11
+        color: 4210752
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15003
+    }
+  }
+}
+cont {
   name: "amenity-cinema"
   element {
     scale: 16
@@ -6297,6 +6414,45 @@ cont {
   }
 }
 cont {
+  name: "amenity-veterinary"
+  element {
+    scale: 17
+    caption {
+      primary {
+        height: 11
+        color: 4210752
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15003
+    }
+  }
+  element {
+    scale: 18
+    caption {
+      primary {
+        height: 11
+        color: 4210752
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15003
+    }
+  }
+  element {
+    scale: 19
+    caption {
+      primary {
+        height: 11
+        color: 4210752
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15003
+    }
+  }
+}
+cont {
   name: "amenity-waste_disposal"
   element {
     scale: 17
@@ -69197,6 +69353,69 @@ cont {
   }
 }
 cont {
+  name: "shop-copyshop"
+  element {
+    scale: 15
+    caption {
+      primary {
+        height: 11
+        color: 4210752
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15003
+    }
+  }
+  element {
+    scale: 16
+    caption {
+      primary {
+        height: 11
+        color: 4210752
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15003
+    }
+  }
+  element {
+    scale: 17
+    caption {
+      primary {
+        height: 11
+        color: 4210752
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15003
+    }
+  }
+  element {
+    scale: 18
+    caption {
+      primary {
+        height: 11
+        color: 4210752
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15003
+    }
+  }
+  element {
+    scale: 19
+    caption {
+      primary {
+        height: 11
+        color: 4210752
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15003
+    }
+  }
+}
+cont {
   name: "shop-department_store"
   element {
     scale: 15
@@ -69327,6 +69546,69 @@ cont {
   }
 }
 cont {
+  name: "shop-dry_cleaning"
+  element {
+    scale: 15
+    caption {
+      primary {
+        height: 11
+        color: 4210752
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15003
+    }
+  }
+  element {
+    scale: 16
+    caption {
+      primary {
+        height: 11
+        color: 4210752
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15003
+    }
+  }
+  element {
+    scale: 17
+    caption {
+      primary {
+        height: 11
+        color: 4210752
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15003
+    }
+  }
+  element {
+    scale: 18
+    caption {
+      primary {
+        height: 11
+        color: 4210752
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15003
+    }
+  }
+  element {
+    scale: 19
+    caption {
+      primary {
+        height: 11
+        color: 4210752
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15003
+    }
+  }
+}
+cont {
   name: "shop-electronics"
   element {
     scale: 15
@@ -70291,6 +70573,132 @@ cont {
   }
 }
 cont {
+  name: "shop-outdoor"
+  element {
+    scale: 15
+    caption {
+      primary {
+        height: 11
+        color: 4210752
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15003
+    }
+  }
+  element {
+    scale: 16
+    caption {
+      primary {
+        height: 11
+        color: 4210752
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15003
+    }
+  }
+  element {
+    scale: 17
+    caption {
+      primary {
+        height: 11
+        color: 4210752
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15003
+    }
+  }
+  element {
+    scale: 18
+    caption {
+      primary {
+        height: 11
+        color: 4210752
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15003
+    }
+  }
+  element {
+    scale: 19
+    caption {
+      primary {
+        height: 11
+        color: 4210752
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15003
+    }
+  }
+}
+cont {
+  name: "shop-photo"
+  element {
+    scale: 15
+    caption {
+      primary {
+        height: 11
+        color: 4210752
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15003
+    }
+  }
+  element {
+    scale: 16
+    caption {
+      primary {
+        height: 11
+        color: 4210752
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15003
+    }
+  }
+  element {
+    scale: 17
+    caption {
+      primary {
+        height: 11
+        color: 4210752
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15003
+    }
+  }
+  element {
+    scale: 18
+    caption {
+      primary {
+        height: 11
+        color: 4210752
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15003
+    }
+  }
+  element {
+    scale: 19
+    caption {
+      primary {
+        height: 11
+        color: 4210752
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15003
+    }
+  }
+}
+cont {
   name: "shop-shoes"
   element {
     scale: 15
@@ -70599,6 +71007,132 @@ cont {
   }
 }
 cont {
+  name: "shop-travel_agency"
+  element {
+    scale: 15
+    caption {
+      primary {
+        height: 11
+        color: 4210752
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15003
+    }
+  }
+  element {
+    scale: 16
+    caption {
+      primary {
+        height: 11
+        color: 4210752
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15003
+    }
+  }
+  element {
+    scale: 17
+    caption {
+      primary {
+        height: 11
+        color: 4210752
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15003
+    }
+  }
+  element {
+    scale: 18
+    caption {
+      primary {
+        height: 11
+        color: 4210752
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15003
+    }
+  }
+  element {
+    scale: 19
+    caption {
+      primary {
+        height: 11
+        color: 4210752
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15003
+    }
+  }
+}
+cont {
+  name: "shop-tyres"
+  element {
+    scale: 15
+    caption {
+      primary {
+        height: 11
+        color: 4210752
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15003
+    }
+  }
+  element {
+    scale: 16
+    caption {
+      primary {
+        height: 11
+        color: 4210752
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15003
+    }
+  }
+  element {
+    scale: 17
+    caption {
+      primary {
+        height: 11
+        color: 4210752
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15003
+    }
+  }
+  element {
+    scale: 18
+    caption {
+      primary {
+        height: 11
+        color: 4210752
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15003
+    }
+  }
+  element {
+    scale: 19
+    caption {
+      primary {
+        height: 11
+        color: 4210752
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15003
+    }
+  }
+}
+cont {
   name: "sport-american_football"
   element {
     scale: 17
diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin
index 932e574e9d..c664c7a2cd 100644
--- a/data/drules_proto_clear.bin
+++ b/data/drules_proto_clear.bin
diff --git a/data/drules_proto_clear.txt b/data/drules_proto_clear.txt
index 681a6c34b6..7e02606a15 100644
--- a/data/drules_proto_clear.txt
+++ b/data/drules_proto_clear.txt
@@ -2954,6 +2954,24 @@ cont {
   }
 }
 cont {
+  name: "amenity-car_wash"
+  element {
+    scale: 19
+    symbol {
+      name: "none"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15000
+    }
+  }
+}
+cont {
   name: "amenity-casino"
   element {
     scale: 16
@@ -3021,6 +3039,42 @@ cont {
   }
 }
 cont {
+  name: "amenity-charging_station"
+  element {
+    scale: 19
+    symbol {
+      name: "none"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15000
+    }
+  }
+}
+cont {
+  name: "amenity-childcare"
+  element {
+    scale: 19
+    symbol {
+      name: "none"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15000
+    }
+  }
+}
+cont {
   name: "amenity-cinema"
   element {
     scale: 17
@@ -7281,6 +7335,24 @@ cont {
   }
 }
 cont {
+  name: "amenity-veterinary"
+  element {
+    scale: 19
+    symbol {
+      name: "none"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15000
+    }
+  }
+}
+cont {
   name: "amenity-waste_disposal"
   element {
     scale: 18
@@ -62577,6 +62649,89 @@ cont {
   }
 }
 cont {
+  name: "shop-copyshop"
+  element {
+    scale: 15
+    symbol {
+      name: "shop-m"
+      priority: 16851
+      min_distance: 0
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15851
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "shop-m"
+      priority: 16851
+      min_distance: 0
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15851
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "shop-l"
+      priority: 16851
+      min_distance: 0
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15851
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-l"
+      priority: 16851
+      min_distance: 0
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15851
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-l"
+      priority: 16851
+      min_distance: 0
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15851
+    }
+  }
+}
+cont {
   name: "shop-department_store"
   element {
     scale: 15
@@ -62743,6 +62898,89 @@ cont {
   }
 }
 cont {
+  name: "shop-dry_cleaning"
+  element {
+    scale: 15
+    symbol {
+      name: "shop-m"
+      priority: 16851
+      min_distance: 0
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15851
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "shop-m"
+      priority: 16851
+      min_distance: 0
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15851
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "shop-l"
+      priority: 16851
+      min_distance: 0
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15851
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-l"
+      priority: 16851
+      min_distance: 0
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15851
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-l"
+      priority: 16851
+      min_distance: 0
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15851
+    }
+  }
+}
+cont {
   name: "shop-electronics"
   element {
     scale: 15
@@ -63939,6 +64177,172 @@ cont {
   }
 }
 cont {
+  name: "shop-outdoor"
+  element {
+    scale: 15
+    symbol {
+      name: "shop-m"
+      priority: 16851
+      min_distance: 0
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15851
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "shop-m"
+      priority: 16851
+      min_distance: 0
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15851
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "shop-l"
+      priority: 16851
+      min_distance: 0
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15851
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-l"
+      priority: 16851
+      min_distance: 0
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15851
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-l"
+      priority: 16851
+      min_distance: 0
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15851
+    }
+  }
+}
+cont {
+  name: "shop-photo"
+  element {
+    scale: 15
+    symbol {
+      name: "shop-m"
+      priority: 16851
+      min_distance: 0
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15851
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "shop-m"
+      priority: 16851
+      min_distance: 0
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15851
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "shop-l"
+      priority: 16851
+      min_distance: 0
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15851
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-l"
+      priority: 16851
+      min_distance: 0
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15851
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-l"
+      priority: 16851
+      min_distance: 0
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15851
+    }
+  }
+}
+cont {
   name: "shop-shoes"
   element {
     scale: 15
@@ -64305,6 +64709,172 @@ cont {
   }
 }
 cont {
+  name: "shop-travel_agency"
+  element {
+    scale: 15
+    symbol {
+      name: "shop-m"
+      priority: 16851
+      min_distance: 0
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15851
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "shop-m"
+      priority: 16851
+      min_distance: 0
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15851
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "shop-l"
+      priority: 16851
+      min_distance: 0
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15851
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-l"
+      priority: 16851
+      min_distance: 0
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15851
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-l"
+      priority: 16851
+      min_distance: 0
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15851
+    }
+  }
+}
+cont {
+  name: "shop-tyres"
+  element {
+    scale: 15
+    symbol {
+      name: "shop-m"
+      priority: 16851
+      min_distance: 0
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15851
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "shop-m"
+      priority: 16851
+      min_distance: 0
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15851
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "shop-l"
+      priority: 16851
+      min_distance: 0
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15851
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-l"
+      priority: 16851
+      min_distance: 0
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15851
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-l"
+      priority: 16851
+      min_distance: 0
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15851
+    }
+  }
+}
+cont {
   name: "sport-american_football"
   element {
     scale: 18
diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin
index a71bec62d0..3205447f72 100644
--- a/data/drules_proto_dark.bin
+++ b/data/drules_proto_dark.bin
diff --git a/data/drules_proto_dark.txt b/data/drules_proto_dark.txt
index 08aca7eb42..dc49b078e8 100644
--- a/data/drules_proto_dark.txt
+++ b/data/drules_proto_dark.txt
@@ -2954,6 +2954,24 @@ cont {
   }
 }
 cont {
+  name: "amenity-car_wash"
+  element {
+    scale: 19
+    symbol {
+      name: "none"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15000
+    }
+  }
+}
+cont {
   name: "amenity-casino"
   element {
     scale: 16
@@ -3021,6 +3039,42 @@ cont {
   }
 }
 cont {
+  name: "amenity-charging_station"
+  element {
+    scale: 19
+    symbol {
+      name: "none"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15000
+    }
+  }
+}
+cont {
+  name: "amenity-childcare"
+  element {
+    scale: 19
+    symbol {
+      name: "none"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15000
+    }
+  }
+}
+cont {
   name: "amenity-cinema"
   element {
     scale: 17
@@ -7281,6 +7335,24 @@ cont {
   }
 }
 cont {
+  name: "amenity-veterinary"
+  element {
+    scale: 19
+    symbol {
+      name: "none"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15000
+    }
+  }
+}
+cont {
   name: "amenity-waste_disposal"
   element {
     scale: 18
@@ -62577,6 +62649,89 @@ cont {
   }
 }
 cont {
+  name: "shop-copyshop"
+  element {
+    scale: 15
+    symbol {
+      name: "shop-m"
+      priority: 16851
+      min_distance: 0
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15851
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "shop-m"
+      priority: 16851
+      min_distance: 0
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15851
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "shop-l"
+      priority: 16851
+      min_distance: 0
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15851
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-l"
+      priority: 16851
+      min_distance: 0
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15851
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-l"
+      priority: 16851
+      min_distance: 0
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15851
+    }
+  }
+}
+cont {
   name: "shop-department_store"
   element {
     scale: 15
@@ -62743,6 +62898,89 @@ cont {
   }
 }
 cont {
+  name: "shop-dry_cleaning"
+  element {
+    scale: 15
+    symbol {
+      name: "shop-m"
+      priority: 16851
+      min_distance: 0
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15851
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "shop-m"
+      priority: 16851
+      min_distance: 0
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15851
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "shop-l"
+      priority: 16851
+      min_distance: 0
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15851
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-l"
+      priority: 16851
+      min_distance: 0
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15851
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-l"
+      priority: 16851
+      min_distance: 0
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15851
+    }
+  }
+}
+cont {
   name: "shop-electronics"
   element {
     scale: 15
@@ -63939,6 +64177,172 @@ cont {
   }
 }
 cont {
+  name: "shop-outdoor"
+  element {
+    scale: 15
+    symbol {
+      name: "shop-m"
+      priority: 16851
+      min_distance: 0
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15851
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "shop-m"
+      priority: 16851
+      min_distance: 0
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15851
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "shop-l"
+      priority: 16851
+      min_distance: 0
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15851
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-l"
+      priority: 16851
+      min_distance: 0
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15851
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-l"
+      priority: 16851
+      min_distance: 0
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15851
+    }
+  }
+}
+cont {
+  name: "shop-photo"
+  element {
+    scale: 15
+    symbol {
+      name: "shop-m"
+      priority: 16851
+      min_distance: 0
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15851
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "shop-m"
+      priority: 16851
+      min_distance: 0
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15851
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "shop-l"
+      priority: 16851
+      min_distance: 0
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15851
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-l"
+      priority: 16851
+      min_distance: 0
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15851
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-l"
+      priority: 16851
+      min_distance: 0
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15851
+    }
+  }
+}
+cont {
   name: "shop-shoes"
   element {
     scale: 15
@@ -64305,6 +64709,172 @@ cont {
   }
 }
 cont {
+  name: "shop-travel_agency"
+  element {
+    scale: 15
+    symbol {
+      name: "shop-m"
+      priority: 16851
+      min_distance: 0
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15851
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "shop-m"
+      priority: 16851
+      min_distance: 0
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15851
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "shop-l"
+      priority: 16851
+      min_distance: 0
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15851
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-l"
+      priority: 16851
+      min_distance: 0
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15851
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-l"
+      priority: 16851
+      min_distance: 0
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15851
+    }
+  }
+}
+cont {
+  name: "shop-tyres"
+  element {
+    scale: 15
+    symbol {
+      name: "shop-m"
+      priority: 16851
+      min_distance: 0
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15851
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "shop-m"
+      priority: 16851
+      min_distance: 0
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15851
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "shop-l"
+      priority: 16851
+      min_distance: 0
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15851
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-l"
+      priority: 16851
+      min_distance: 0
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15851
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-l"
+      priority: 16851
+      min_distance: 0
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15851
+    }
+  }
+}
+cont {
   name: "sport-american_football"
   element {
     scale: 18
diff --git a/data/drules_proto_legacy.bin b/data/drules_proto_legacy.bin
index f5e9f9e3ad..6d545fc92d 100644
--- a/data/drules_proto_legacy.bin
+++ b/data/drules_proto_legacy.bin
diff --git a/data/drules_proto_legacy.txt b/data/drules_proto_legacy.txt
index 56d84b3f0c..d48bce75f4 100644
--- a/data/drules_proto_legacy.txt
+++ b/data/drules_proto_legacy.txt
@@ -1951,6 +1951,45 @@ cont {
   }
 }
 cont {
+  name: "amenity-car_wash"
+  element {
+    scale: 17
+    caption {
+      primary {
+        height: 11
+        color: 4210752
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15003
+    }
+  }
+  element {
+    scale: 18
+    caption {
+      primary {
+        height: 11
+        color: 4210752
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15003
+    }
+  }
+  element {
+    scale: 19
+    caption {
+      primary {
+        height: 11
+        color: 4210752
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15003
+    }
+  }
+}
+cont {
   name: "amenity-casino"
   element {
     scale: 17
@@ -1990,6 +2029,84 @@ cont {
   }
 }
 cont {
+  name: "amenity-charging_station"
+  element {
+    scale: 17
+    caption {
+      primary {
+        height: 11
+        color: 4210752
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15003
+    }
+  }
+  element {
+    scale: 18
+    caption {
+      primary {
+        height: 11
+        color: 4210752
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15003
+    }
+  }
+  element {
+    scale: 19
+    caption {
+      primary {
+        height: 11
+        color: 4210752
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15003
+    }
+  }
+}
+cont {
+  name: "amenity-childcare"
+  element {
+    scale: 17
+    caption {
+      primary {
+        height: 11
+        color: 4210752
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15003
+    }
+  }
+  element {
+    scale: 18
+    caption {
+      primary {
+        height: 11
+        color: 4210752
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15003
+    }
+  }
+  element {
+    scale: 19
+    caption {
+      primary {
+        height: 11
+        color: 4210752
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15003
+    }
+  }
+}
+cont {
   name: "amenity-cinema"
   element {
     scale: 16
@@ -5530,6 +5647,45 @@ cont {
   }
 }
 cont {
+  name: "amenity-veterinary"
+  element {
+    scale: 17
+    caption {
+      primary {
+        height: 11
+        color: 4210752
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15003
+    }
+  }
+  element {
+    scale: 18
+    caption {
+      primary {
+        height: 11
+        color: 4210752
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15003
+    }
+  }
+  element {
+    scale: 19
+    caption {
+      primary {
+        height: 11
+        color: 4210752
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15003
+    }
+  }
+}
+cont {
   name: "amenity-waste_disposal"
   element {
     scale: 17
@@ -63298,6 +63454,45 @@ cont {
   }
 }
 cont {
+  name: "shop-copyshop"
+  element {
+    scale: 17
+    caption {
+      primary {
+        height: 11
+        color: 4210752
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15003
+    }
+  }
+  element {
+    scale: 18
+    caption {
+      primary {
+        height: 11
+        color: 4210752
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15003
+    }
+  }
+  element {
+    scale: 19
+    caption {
+      primary {
+        height: 11
+        color: 4210752
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15003
+    }
+  }
+}
+cont {
   name: "shop-department_store"
   element {
     scale: 16
@@ -63414,6 +63609,45 @@ cont {
   }
 }
 cont {
+  name: "shop-dry_cleaning"
+  element {
+    scale: 17
+    caption {
+      primary {
+        height: 11
+        color: 4210752
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15003
+    }
+  }
+  element {
+    scale: 18
+    caption {
+      primary {
+        height: 11
+        color: 4210752
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15003
+    }
+  }
+  element {
+    scale: 19
+    caption {
+      primary {
+        height: 11
+        color: 4210752
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15003
+    }
+  }
+}
+cont {
   name: "shop-electronics"
   element {
     scale: 17
@@ -64072,6 +64306,84 @@ cont {
   }
 }
 cont {
+  name: "shop-outdoor"
+  element {
+    scale: 17
+    caption {
+      primary {
+        height: 11
+        color: 4210752
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15003
+    }
+  }
+  element {
+    scale: 18
+    caption {
+      primary {
+        height: 11
+        color: 4210752
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15003
+    }
+  }
+  element {
+    scale: 19
+    caption {
+      primary {
+        height: 11
+        color: 4210752
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15003
+    }
+  }
+}
+cont {
+  name: "shop-photo"
+  element {
+    scale: 17
+    caption {
+      primary {
+        height: 11
+        color: 4210752
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15003
+    }
+  }
+  element {
+    scale: 18
+    caption {
+      primary {
+        height: 11
+        color: 4210752
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15003
+    }
+  }
+  element {
+    scale: 19
+    caption {
+      primary {
+        height: 11
+        color: 4210752
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15003
+    }
+  }
+}
+cont {
   name: "shop-shoes"
   element {
     scale: 17
@@ -64271,6 +64583,84 @@ cont {
   }
 }
 cont {
+  name: "shop-travel_agency"
+  element {
+    scale: 17
+    caption {
+      primary {
+        height: 11
+        color: 4210752
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15003
+    }
+  }
+  element {
+    scale: 18
+    caption {
+      primary {
+        height: 11
+        color: 4210752
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15003
+    }
+  }
+  element {
+    scale: 19
+    caption {
+      primary {
+        height: 11
+        color: 4210752
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15003
+    }
+  }
+}
+cont {
+  name: "shop-tyres"
+  element {
+    scale: 17
+    caption {
+      primary {
+        height: 11
+        color: 4210752
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15003
+    }
+  }
+  element {
+    scale: 18
+    caption {
+      primary {
+        height: 11
+        color: 4210752
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15003
+    }
+  }
+  element {
+    scale: 19
+    caption {
+      primary {
+        height: 11
+        color: 4210752
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15003
+    }
+  }
+}
+cont {
   name: "sport-american_football"
   element {
     scale: 17
diff --git a/data/types.txt b/data/types.txt
index 38e73313c7..b100a50251 100644
--- a/data/types.txt
+++ b/data/types.txt
@@ -1053,3 +1053,17 @@ highway|world_level
 highway|world_towns_level
 building|train_station
 route|shuttle_train
+shop|copyshop
+shop|photo
+shop|travel_agency
+shop|travel_agency
+shop|outdoor
+craft|tailor
+office|estate_agent
+shop|dry_cleaning
+shop|tyres
+leisure|swimming_pool
+amenity|car_wash
+amenity|veterinary
+amenity|charging_station
+amenity|childcare
diff --git a/data/visibility.txt b/data/visibility.txt
index c5dc178cdd..60068a0d67 100644
--- a/data/visibility.txt
+++ b/data/visibility.txt
@@ -31,7 +31,10 @@ world  00000000000000000000  +
         cafe  00000000000000001111  -
         car_rental  00000000000000001111  -
         car_sharing  00000000000000001111  -
+        car_wash  00000000000000000111  -
         casino  00000000000000000111  -
+        charging_station  00000000000000000111  -
+        childcare  00000000000000000111  -
         cinema  00000000000000001111  -
         clinic  00000000000000000111  -
         college  00000000000001111111  -
@@ -97,6 +100,7 @@ world  00000000000000000000  +
             parking_tickets  00000000000000000111  -
             public_transport_tickets  00000000000000000111  -
             {}
+        veterinary  00000000000000000111  -
         waste_disposal  00000000000000000111  -
         {}
     area:highway  00000000000000000000  +
@@ -722,8 +726,10 @@ world  00000000000000000000  +
         computer  00000000000000000111  -
         confectionery  00000000000000000111  -
         convenience  00000000000000001111  -
+        copyshop  00000000000000000111  -
         department_store  00000000000000001111  -
         doityourself  00000000000000001111  -
+        dry_cleaning  00000000000000000111  -
         electronics  00000000000000000111  -
         florist  00000000000000000111  -
         furniture  00000000000000001111  -
@@ -738,10 +744,14 @@ world  00000000000000000000  +
         mall  00000000000000001111  -
         mobile_phone  00000000000000000111  -
         optician  00000000000000000111  -
+        outdoor  00000000000000000111  -
+        photo  00000000000000000111  -
         shoes  00000000000000000111  -
         sports  00000000000000000111  -
         supermarket  00000000000000001111  -
         toys  00000000000000000111  -
+        travel_agency  00000000000000000111  -
+        tyres  00000000000000000111  -
         {}
     sport  00000000000000000000  +
         american_football  00000000000000000111  -