From 32c9c4bfaac59c5cebb31485d24980f9cd4b5be6 Mon Sep 17 00:00:00 2001
From: Ilya Zverev <zverik@textual.ru>
Date: Fri, 18 Mar 2016 18:00:14 +0300
Subject: [PATCH 1/4] [styles] Added a lot of shops and amenities

---
 data/mapcss-mapping.csv | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv
index e214d7c804..eeb57b6fa5 100644
--- a/data/mapcss-mapping.csv
+++ b/data/mapcss-mapping.csv
@@ -1053,3 +1053,17 @@ highway|world_level;[highway=world_level];;name;int_name;1052;
 highway|world_towns_level;[highway=world_towns_level];;name;int_name;1053;
 building|train_station;[building=train_station];;name;int_name;1054;
 route|shuttle_train;[route=shuttle_train];;name;int_name;1055;
+shop|copyshop;[shop=copyshop];;name;int_name;1056;
+shop|photo;[shop=photo];;name;int_name;1057;
+shop|travel_agency;[shop=travel_agency];;name;int_name;1058;
+office|travel_agent;[office=travel_agent];x;name;int_name;1059;shop|travel_agency
+shop|outdoor;[shop=outdoor];;name;int_name;1060;
+shop|tailor;[shop=tailor];x;name;int_name;1061;craft|tailor
+shop|estate_agent;[shop=estate_agent];x;name;int_name;1062;office|estate_agent
+shop|dry_cleaning;[shop=dry_cleaning];;name;int_name;1063;
+shop|tyres;[shop=tyres];;name;int_name;1064;
+amenity|swimming_pool;[amenity=swimming_pool];x;name;int_name;1065;leisure|swimming_pool
+amenity|car_wash;[amenity=car_wash];;name;int_name;1066;
+amenity|veterinary;[amenity=veterinary];;name;int_name;1067;
+amenity|charging_station;[amenity=charging_station];;name;int_name;1068;
+amenity|childcare;[amenity=childcare];;name;int_name;1069;

From 97ae337d66e587327ac29e96d057482f0f7d0a4b Mon Sep 17 00:00:00 2001
From: Ilya Zverev <zverik@textual.ru>
Date: Thu, 24 Mar 2016 13:45:12 +0300
Subject: [PATCH 2/4] Categories for new types

---
 data/categories.txt | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/data/categories.txt b/data/categories.txt
index 4aaccfaf1e..dd33adb99b 100644
--- a/data/categories.txt
+++ b/data/categories.txt
@@ -5037,3 +5037,43 @@ en:Lighthouse
 nl:Vuurtoren
 ru:Маяк
 de:Leuchtturm
+
+shop-copyshop
+en:Copy Shop|Printer
+ru:Копировальный центр|печать|полиграфия
+
+shop-photo
+en:Photo Shop|frames|shop
+ru:Фототовары|магазин
+
+shop-travel_agency
+en:Travel Agency|tours
+ru:Турагентство|путешествия
+
+shop-outdoor
+en:Outdoor Equipment|trekking|climbing|camping|shop
+ru:Снаряжение|магазин
+
+shop-dry_cleaning
+en:Dry Cleaning|cleaning
+ru:Химчистка
+
+shop-tyres
+en:Tyre Shop|shop
+ru:Магазин шин|магазин
+
+amenity-car_wash
+en:Car Wash
+ru:Автомойка
+
+amenity-veterinary
+en:Veterinary Doctor
+ru:Ветеринарная клиника
+
+amenity-charging_station
+en:Charging Station|charging
+ru:Зарядная станция
+
+amenity-childcare
+en:Nursery|Child Care
+ru:Детская комната|ясли

From 6d513136ce5d37f6eaeb35289156bf458da21696 Mon Sep 17 00:00:00 2001
From: Ilya Zverev <zverik@textual.ru>
Date: Thu, 24 Mar 2016 14:15:10 +0300
Subject: [PATCH 3/4] Generated styles

---
 data/classificator.txt       |  10 +
 data/drules_proto.bin        | Bin 228489 -> 229740 bytes
 data/drules_proto.txt        | 534 ++++++++++++++++++++++++++++++++
 data/drules_proto_clear.bin  | Bin 211966 -> 213371 bytes
 data/drules_proto_clear.txt  | 570 +++++++++++++++++++++++++++++++++++
 data/drules_proto_dark.bin   | Bin 209279 -> 210684 bytes
 data/drules_proto_dark.txt   | 570 +++++++++++++++++++++++++++++++++++
 data/drules_proto_legacy.bin | Bin 207547 -> 208492 bytes
 data/drules_proto_legacy.txt | 390 ++++++++++++++++++++++++
 data/types.txt               |  14 +
 data/visibility.txt          |  10 +
 11 files changed, 2098 insertions(+)

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 b3125ceca91d18865eac2f79b4670cf083f7760a..8c2559315e312ab2918dc68781789d294a304745 100644
GIT binary patch
delta 287
zcmeDD$@`{>Z$r40a4eTVVs2_)W=W-Pa$-?@d17(K<VGo<$>CCE(y3e$aJh`cqV&wX
z^!VbE#FEVXJdhfZI4(hid}dAx(16s<jZ)dVqVZfpFqyK{lGLKiyu_kPke=o@?(J{f
z8MnW2XJY<5y}^;0lO;L7pmMsu0dv##_g2hZjG_}5xde+d@(XlRiYnuib5axYfc8$G
z=*V2Rz0!txGv{=ECuUCe{L+$?{QM%YIA13t7Z+GdK}LQ_K3Ht}J`-ln?WS(bw#?Ic
k?U^}wONtW9Qgh-H(^K=3E77!-R2HQcL#!zBWEM9D02TyhG5`Po

delta 59
zcmV-B0L1_7f)0uK4X{@llZhM*lfoKmv-2AtErWAOhjU2*w{uAX1M{~9Jp+mXw<13S
RvkABFNdra$w^dF97c<7h6@>r*

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
@@ -2319,6 +2319,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 {
@@ -2370,6 +2409,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 {
@@ -6296,6 +6413,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 {
@@ -69196,6 +69352,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 {
@@ -69326,6 +69545,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 {
@@ -70290,6 +70572,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 {
@@ -70598,6 +71006,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 {
diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin
index 932e574e9dc9ac91f27fd27a784c39030b45f531..c664c7a2cd60e2f8ec3db3438b73fbaefa5c0bfc 100644
GIT binary patch
delta 286
zcmezOo#%HG?}qit!iHP|iMgqHnI)CF$%#er<%z`^lO2K-Ca+gsEp5pq0hh~2EK1MJ
zOOG!uNi50C&jYCuG2#+L$Y<uH01Ze5No<Z%(J&S@<`RO*mZg@Y7G>ro7FB|zo14Ph
zo5C5lH-$5q&zv6rj)|M8pmO^DCrmrH@BF|tgHiN2BbQ)tMt*^AN>OEea!zVu9?<6L
zh0mF`PXF+piF13@Cnjy~>2F^!akA%^mZaq87eOQgell^g7G&g?<Rkdo`~EUzF^isH
s<PriKSyGf(mYNfvn4X%KJiXvK)3)g#UCbqwMbjt#W!k>=2Q!;B0IP&>@Bjb+

delta 55
zcmV-70LcIQf(`!n46v^wlj0+*v-~6|GlN-Jhgnzww^>*MH<`Cq@&cFvx485IGz+(M
N0RwXbw{->s20PL|7JmQ$

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
@@ -2953,6 +2953,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 {
@@ -3020,6 +3038,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 {
@@ -7280,6 +7334,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 {
@@ -62576,6 +62648,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 {
@@ -62742,6 +62897,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 {
@@ -63938,6 +64176,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 {
@@ -64304,6 +64708,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 {
diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin
index a71bec62d0b8a6b866527b96a399f2a3053c5195..3205447f72db97a27a60c49783314a5c964b0d05 100644
GIT binary patch
delta 278
zcmezWi098+o(=1jg$=m`5_41YGD|9TlM{>L%M*(;CU?mwOkS_NTH2CJ0xp-4Sd^Zb
zmmXhSl30?Np9fMSV#Fngkk8CX0UD4BlGq%ja^FbAm`eyITb5dqT9lcWSTwm)MzPs4
zyxlUKal2(W)BFDE=bkWeGZj=$*SpQMbGycKrWuT)#~HZ<i!<^IbW@5d<CAkz6Z3!;
zPj`IIv~~M|7fdGH(_`*4akA%^mZaq87lFm6?|;w4$y$(+Uy_gDZ~yz5DT`U`1S6La
h*tC+O#In?!_{8+oyyQxRGM19cqSWmhzcHP&0sx>iZf*bo

delta 60
zcmV-C0K@<M?F|3o46v^wlj0+*v-~9AGJ_CUhY(l+w-8tY?~k{|=mMAlw<qfYGz*s?
S_W}vG?Dqm{1GnV-0vI}pLmRvR

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
@@ -2953,6 +2953,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 {
@@ -3020,6 +3038,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 {
@@ -7280,6 +7334,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 {
@@ -62576,6 +62648,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 {
@@ -62742,6 +62897,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 {
@@ -63938,6 +64176,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 {
@@ -64304,6 +64708,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 {
diff --git a/data/drules_proto_legacy.bin b/data/drules_proto_legacy.bin
index f5e9f9e3ad659c6df54944849bb6485ec392b3de..6d545fc92da8f80f8b2758b547a07584232d7be4 100644
GIT binary patch
delta 280
zcmdmemFLYJo(*bZ!m(TeiMgqHnI)CF$%#er<%z`^lMRb~CQFL*Og0h=luG52fXinj
z7NuwArN<YSB$j06Pj)Qu6^i2$L`Y}mq$DR!pYV^#Z*#L4v!-Y~mk>;{EVU%HC^Ijy
zs1js)bDMp8n?2+9HhZSyyQj-CGjnhx=ND8KXXF=vq__M2W{P7J0h$dG(M>6;j8D!<
zP0Rz@4VGU0hv^*K)Va(YZ26@nDf#)6ALje=hI4U&RTpIBm*j($RWdWHGEH~*#l*o|
kQj}PhniHRxo|=~ob^$j`c}Zo_^p9Ve{I<_yWtLS106f5Ee*gdg

delta 64
zcmV-G0Kfn2+zh+b46r5^lRp>?laUrtmv9>c1hcId|0shEL5B@N0k;i70>`_zF#Q5v
W0k`h{0?r1va0UY<0=G{I105wP@fSV-

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
@@ -1950,6 +1950,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 {
@@ -1989,6 +2028,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 {
@@ -5529,6 +5646,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 {
@@ -63297,6 +63453,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 {
@@ -63413,6 +63608,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 {
@@ -64071,6 +64305,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 {
@@ -64270,6 +64582,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 {
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  -

From 4b6a2a5470845e66439da7429bd3fad12a6d51f0 Mon Sep 17 00:00:00 2001
From: Ilya Zverev <zverik@textual.ru>
Date: Thu, 24 Mar 2016 14:32:41 +0300
Subject: [PATCH 4/4] Add new types to editor

---
 data/editor.config | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/data/editor.config b/data/editor.config
index d66b43ad97..d6b9c15a21 100644
--- a/data/editor.config
+++ b/data/editor.config
@@ -335,6 +335,21 @@
       <type id="amenity-waste_disposal">
         <include field="operator" />
       </type>
+      <type id="amenity-car_wash">
+        <include group="poi" />
+        <include field="internet" />
+      </type>
+      <type id="amenity-childcare">
+        <include group="poi" />
+        <include field="internet" />
+      </type>
+      <type id="amenity-veterinary" group="health">
+        <include group="poi" />
+        <include field="internet" />
+      </type>
+      <type id="amenity-charging_station">
+        <include group="operator" />
+      </type>
       <type id="craft" can_add="no">
         <include group="poi" />
       </type>
@@ -630,6 +645,28 @@
         <include group="poi" />
         <include field="internet" />
       </type>
+      <type id="shop-copyshop" group="shop">
+        <include group="poi" />
+        <include field="internet" />
+      </type>
+      <type id="shop-photo" group="shop">
+        <include group="poi" />
+        <include field="internet" />
+      </type>
+      <type id="shop-travel_agency" group="shop">
+        <include group="poi" />
+      </type>
+      <type id="shop-outdoor" group="shop">
+        <include group="poi" />
+        <include field="internet" />
+      </type>
+      <type id="shop-dry_cleaning">
+        <include group="poi" />
+        <include field="internet" />
+      </type>
+      <type id="shop-tyres" group="shop">
+        <include group="poi" />
+      </type>
       <type id="tourism-alpine_hut" group="accomodation">
         <include group="poi" />
         <include field="ele" />