[android] Update colors used in the editor

Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>

android/app/src/main/res/drawable/ic_track_recording_off.xml

@@ -5,6 +5,45 @@
   android:viewportWidth="74"
   android:viewportHeight="57">
   <path
+    android:pathData="m67.3,21.772 l-28.103,11.757 11.772,5.095 5.463,11.606z"
+    android:strokeLineJoin="round"
+    android:strokeWidth="2"
     android:fillColor="#757575"
-    android:pathData="m26.278,8.137c3.695,-3.729 9.719,-3.761 13.453,-0.073 3.736,3.687 3.769,9.699 0.074,13.425l-14.597,14.726c-2.353,2.373 -2.331,6.197 0.046,8.544 2.379,2.345 6.209,2.326 8.562,-0.048l14.303,-14.428c-0.155,-0.32 -0.286,-0.647 -0.394,-0.978l-4.006,0.001c-2.787,0 -3.659,-3.825 -1.045,-5.042l7.813,-3.604c0.879,-0.652 1.87,-1.098 2.9,-1.333l11.936,-5.495c2.091,-0.869 4.357,1.392 3.486,3.478l-10.454,22.603c-1.219,2.607 -5.053,1.736 -5.053,-1.044v-4.418c-0.506,-0.122 -1.006,-0.296 -1.494,-0.525l-14.303,14.428c-4.368,4.406 -11.485,4.444 -15.901,0.086 -4.413,-4.358 -4.452,-11.461 -0.084,-15.867l14.597,-14.726c1.68,-1.693 1.665,-4.426 -0.033,-6.102 -1.7,-1.677 -4.437,-1.662 -6.117,0.033l-9.43,9.516c0.436,0.994 0.679,2.091 0.679,3.244 0,4.464 -3.634,8.091 -8.108,8.091 -4.475,0 -8.108,-3.627 -8.108,-8.091 0,-4.466 3.633,-8.091 8.108,-8.091 1.424,0 2.764,0.367 3.928,1.012z" />
+    android:strokeColor="#757575" />
+  <path
+    android:pathData="M45.042,44.7m-4.5,0a4.5,4.5 0,1 1,9 0a4.5,4.5 0,1 1,-9 0"
+    android:fillColor="#757575" />
+  <path
+    android:pathData="M37.942,51.6m-4.5,0a4.5,4.5 0,1 1,9 0a4.5,4.5 0,1 1,-9 0"
+    android:fillColor="#757575" />
+  <path
+    android:pathData="M27.842,52m-4.5,0a4.5,4.5 0,1 1,9 0a4.5,4.5 0,1 1,-9 0"
+    android:fillColor="#757575" />
+  <path
+    android:pathData="m26.942,43.5c0,2.485 -2.015,4.5 -4.5,4.5 -2.485,0 -4.5,-2.015 -4.5,-4.5 0,-2.485 2.015,-4.5 4.5,-4.5 2.485,0 4.5,2.015 4.5,4.5z"
+    android:fillColor="#757575" />
+  <path
+    android:pathData="M26.642,34.5m-4.5,0a4.5,4.5 0,1 1,9 0a4.5,4.5 0,1 1,-9 0"
+    android:fillColor="#757575" />
+  <path
+    android:pathData="M34.042,27.5m-4.5,0a4.5,4.5 0,1 1,9 0a4.5,4.5 0,1 1,-9 0"
+    android:fillColor="#757575" />
+  <path
+    android:pathData="M40.842,20.5m-4.5,0a4.5,4.5 0,1 1,9 0a4.5,4.5 0,1 1,-9 0"
+    android:fillColor="#757575" />
+  <path
+    android:pathData="M41.842,10.5m-4.5,0a4.5,4.5 0,1 1,9 0a4.5,4.5 0,1 1,-9 0"
+    android:fillColor="#757575" />
+  <path
+    android:pathData="M32.842,4.5m-4.5,0a4.5,4.5 0,1 1,9 0a4.5,4.5 0,1 1,-9 0"
+    android:fillColor="#757575" />
+  <path
+    android:pathData="M23.842,9.5m-4.5,0a4.5,4.5 0,1 1,9 0a4.5,4.5 0,1 1,-9 0"
+    android:fillColor="#757575" />
+  <path
+    android:pathData="M16.842,16.5m-4.5,0a4.5,4.5 0,1 1,9 0a4.5,4.5 0,1 1,-9 0"
+    android:fillColor="#757575" />
+  <path
+    android:pathData="M9.842,23.5m-4.5,0a4.5,4.5 0,1 1,9 0a4.5,4.5 0,1 1,-9 0"
+    android:fillColor="#757575" />
 </vector>

android/app/src/main/res/drawable/ic_track_recording_on.xml

@@ -9,6 +9,45 @@
       android:fillColor="@color/active_track_recording"
       android:fillAlpha="0.78" />
     <path
-      android:pathData="m33.024,19.508c3.955,-3.981 10.402,-4.015 14.399,-0.078 3.999,3.937 4.034,10.355 0.079,14.333l-15.623,15.722c-2.518,2.534 -2.495,6.616 0.049,9.122 2.546,2.504 6.646,2.483 9.164,-0.051l15.309,-15.404c-0.166,-0.342 -0.306,-0.691 -0.422,-1.044l-4.288,0.001c-2.983,0 -3.916,-4.084 -1.118,-5.383l8.362,-3.848c0.941,-0.696 2.001,-1.172 3.104,-1.423l12.775,-5.867c2.238,-0.928 4.663,1.486 3.731,3.713l-11.189,24.132c-1.305,2.783 -5.408,1.854 -5.408,-1.115l-0,-4.717c-0.542,-0.13 -1.077,-0.316 -1.599,-0.561l-15.309,15.404c-4.675,4.704 -12.293,4.745 -17.019,0.092 -4.723,-4.653 -4.765,-12.237 -0.09,-16.941l15.623,-15.722c1.798,-1.808 1.782,-4.725 -0.035,-6.515 -1.819,-1.79 -4.749,-1.774 -6.547,0.035l-10.093,10.16c0.467,1.061 0.727,2.232 0.727,3.464 0,4.766 -3.89,8.638 -8.678,8.638 -4.79,0 -8.678,-3.872 -8.678,-8.638 0,-4.768 3.888,-8.638 8.678,-8.638 1.524,0 2.958,0.392 4.204,1.081z"
-      android:fillColor="#ffffff"/>
+      android:pathData="m78.907,32.87 l-31.833,13.318 13.335,5.772 6.188,13.147z"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#ffffff"
+      android:strokeColor="#ffffff" />
+    <path
+      android:pathData="M49.731,57.709a5.097,5.097 0,1 0,10.195 0a5.097,5.097 0,1 0,-10.195 0z"
+      android:fillColor="#ffffff" />
+    <path
+      android:pathData="M41.688,65.525a5.097,5.097 0,1 0,10.195 0a5.097,5.097 0,1 0,-10.195 0z"
+      android:fillColor="#ffffff" />
+    <path
+      android:pathData="M30.247,65.978a5.097,5.097 0,1 0,10.195 0a5.097,5.097 0,1 0,-10.195 0z"
+      android:fillColor="#ffffff" />
+    <path
+      android:pathData="m34.324,56.35c0,2.815 -2.282,5.097 -5.097,5.097 -2.815,0 -5.097,-2.282 -5.097,-5.097 0,-2.815 2.282,-5.097 5.097,-5.097 2.815,0 5.097,2.282 5.097,5.097z"
+      android:fillColor="#ffffff" />
+    <path
+      android:pathData="M28.888,46.155a5.097,5.097 0,1 0,10.195 0a5.097,5.097 0,1 0,-10.195 0z"
+      android:fillColor="#ffffff" />
+    <path
+      android:pathData="M37.27,38.226a5.097,5.097 0,1 0,10.195 0a5.097,5.097 0,1 0,-10.195 0z"
+      android:fillColor="#ffffff" />
+    <path
+      android:pathData="M44.974,30.297a5.097,5.097 0,1 0,10.195 0a5.097,5.097 0,1 0,-10.195 0z"
+      android:fillColor="#ffffff" />
+    <path
+      android:pathData="M46.106,18.969a5.097,5.097 0,1 0,10.195 0a5.097,5.097 0,1 0,-10.195 0z"
+      android:fillColor="#ffffff" />
+    <path
+      android:pathData="M35.911,12.173a5.097,5.097 0,1 0,10.195 0a5.097,5.097 0,1 0,-10.195 0z"
+      android:fillColor="#ffffff" />
+    <path
+      android:pathData="M25.718,17.837a5.097,5.097 0,1 0,10.195 0a5.097,5.097 0,1 0,-10.195 0z"
+      android:fillColor="#ffffff" />
+    <path
+      android:pathData="M17.788,25.766a5.097,5.097 0,1 0,10.195 0a5.097,5.097 0,1 0,-10.195 0z"
+      android:fillColor="#ffffff" />
+    <path
+      android:pathData="M9.858,33.695a5.097,5.097 0,1 0,10.195 0a5.097,5.097 0,1 0,-10.195 0z"
+      android:fillColor="#ffffff" />
 </vector>

android/app/src/main/res/layout/fragment_editor.xml

@@ -6,7 +6,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:clipToPadding="false"
-    android:background="@color/bg_editor"
+    android:background="?colorSurfaceContainerLow"
     tools:context=".editor.EditorActivity">
   <LinearLayout
       android:layout_width="match_parent"

android/app/src/main/res/layout/fragment_phone.xml

@@ -10,7 +10,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:id="@+id/frameLayout"
-        android:background="@color/bg_editor"
+        android:background="?colorSurfaceContainerLow"
         android:layout_marginBottom="@dimen/margin_quarter">
 
         <androidx.recyclerview.widget.RecyclerView

android/app/src/main/res/layout/fragment_timetable.xml

@@ -9,7 +9,7 @@
     style="@style/MwmWidget.FrameLayout.Elevation"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/bg_editor"
+    android:background="?colorSurfaceContainerLow"
     android:layout_above="@+id/tv__mode_switch"
     android:layout_below="@id/toolbar"/>
 
@@ -19,7 +19,7 @@
     android:layout_height="wrap_content"
     android:layout_alignTop="@+id/tv__mode_switch"
     android:layout_alignParentBottom="true"
-    android:background="@color/bg_editor"/>
+    android:background="?colorSurfaceContainerLow"/>
 
   <com.google.android.material.textview.MaterialTextView
     android:id="@+id/tv__mode_switch"

android/app/src/main/res/layout/fragment_timetable_advanced.xml

@@ -5,7 +5,7 @@
   xmlns:tools="http://schemas.android.com/tools"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
-  android:background="@color/bg_editor">
+  android:background="?colorSurfaceContainerLow">
 
   <LinearLayout
     android:layout_width="match_parent"

android/app/src/main/res/layout/fragment_timetable_simple.xml

@@ -4,7 +4,7 @@
   android:id="@+id/recycler"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
-  android:background="@color/bg_editor"
+  android:background="?colorSurfaceContainerLow"
   android:paddingStart="@dimen/margin_half"
   android:paddingEnd="@dimen/margin_half"
   android:scrollbars="vertical"/>

android/app/src/main/res/layout/localized_name.xml

@@ -7,7 +7,6 @@
   android:orientation="vertical"
   android:paddingEnd="@dimen/margin_base"
   android:paddingStart="@dimen/margin_base"
-  android:background="@color/fg_editor"
   android:animateLayoutChanges="true">
 
   <com.google.android.material.textview.MaterialTextView
@@ -25,7 +24,6 @@
     android:id="@+id/recycler"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@color/fg_editor"
     android:scrollbars="vertical"/>
 
   <com.google.android.material.button.MaterialButton

android/app/src/main/res/values-night/colors.xml

@@ -16,8 +16,6 @@
   <color name="bg_panel">@color/bg_window</color>
   <color name="bg_primary_dark">#FF588157</color>
   <color name="bg_app">#10140F</color>
-  <color name="bg_editor">#161b14</color>
-  <color name="fg_editor">#282e25</color>
 
   <color name="bg_menu">#CC2D3237</color>
 

android/app/src/main/res/values/colors.xml

@@ -65,8 +65,6 @@
   <color name="bg_panel">@color/bg_window</color>
   <color name="bg_primary_dark">#37653F</color> <!-- secondary dark -->
   <color name="bg_app">@android:color/white</color>
-  <color name="bg_editor">#ebefe4</color>
-  <color name="fg_editor">#f9faf2</color>
 
   <color name="bg_dialog_translucent">#BB000000</color>
   <color name="bg_text_translucent">#99FFFFFF</color>

android/app/src/main/res/values/styles-editor.xml

@@ -89,7 +89,7 @@
     <item name="android:layout_width">match_parent</item>
     <item name="android:layout_height">wrap_content</item>
     <item name="android:layout_marginBottom">@dimen/margin_half</item>
-    <item name="cardBackgroundColor">@color/fg_editor</item>
+    <item name="cardBackgroundColor">?appBackground</item>
     <item name="android:padding">@dimen/margin_base</item>
     <item name="cardPreventCornerOverlap">false</item>
   </style>

android/sdk/src/main/res/values-af/types_strings.xml

@@ -117,6 +117,7 @@
     <string name="type.amenity.public_bookcase">Boekekas</string>
     <!-- SECTION: Types: Recycling -->
     <string name="type.amenity.recycling.centre">Herwinningsentrum</string>
+    <string name="type.amenity.recycling">Herwinningshouer</string>
     <string name="type.amenity.recycling.container">Herwinningshouer</string>
     <string name="type.recycling.batteries">Batterye</string>
     <string name="type.recycling.clothes">Klere</string>

android/sdk/src/main/res/values-ar/types_strings.xml

@@ -130,6 +130,7 @@
     <string name="type.amenity.public_bookcase">مكتبة، تبادل كتب</string>
     <!-- SECTION: Types: Recycling -->
     <string name="type.amenity.recycling.centre">مركز إعادة تدوير</string>
+    <string name="type.amenity.recycling">حاوية لإعادة التدوير</string>
     <string name="type.amenity.recycling.container">حاوية لإعادة التدوير</string>
     <string name="type.recycling.batteries">بطاريات</string>
     <string name="type.recycling.clothes">ملابس</string>

android/sdk/src/main/res/values-az/types_strings.xml

@@ -131,6 +131,7 @@
     <string name="type.amenity.public_bookcase">Kitab mübadiləsi</string>
     <!-- SECTION: Types: Recycling -->
     <string name="type.amenity.recycling.centre">Təkrar Emal Mərkəzi</string>
+    <string name="type.amenity.recycling">Təkrar emal konteyneri</string>
     <string name="type.amenity.recycling.container">Təkrar emal konteyneri</string>
     <string name="type.recycling.batteries">Batareyalar</string>
     <string name="type.recycling.clothes">Geyim</string>

android/sdk/src/main/res/values-be/types_strings.xml

@@ -54,6 +54,7 @@
     <string name="type.amenity.prison">Турма</string>
     <!-- SECTION: Types: Recycling -->
     <string name="type.amenity.recycling.centre">Прыём другсыравіны</string>
+    <string name="type.amenity.recycling">Кантэйнер для другаснай сыравіны</string>
     <string name="type.amenity.recycling.container">Кантэйнер для другаснай сыравіны</string>
     <string name="type.recycling.batteries">Батарэйкі</string>
     <string name="type.recycling.clothes">Адзенне</string>

android/sdk/src/main/res/values-ca/types_strings.xml

@@ -131,6 +131,7 @@
     <string name="type.amenity.public_bookcase">Intercanvi de llibres</string>
     <!-- SECTION: Types: Recycling -->
     <string name="type.amenity.recycling.centre">Centre de reciclatge</string>
+    <string name="type.amenity.recycling">Contenidor de reciclatge</string>
     <string name="type.amenity.recycling.container">Contenidor de reciclatge</string>
     <string name="type.recycling.batteries">Bateries</string>
     <string name="type.recycling.clothes">Roba</string>

android/sdk/src/main/res/values-cs/types_strings.xml

@@ -115,6 +115,7 @@
     <string name="type.amenity.public_bookcase">Výměna knih</string>
     <!-- SECTION: Types: Recycling -->
     <string name="type.amenity.recycling.centre">Recyklační středisko</string>
+    <string name="type.amenity.recycling">Recyklační nádoba</string>
     <string name="type.amenity.recycling.container">Recyklační nádoba</string>
     <string name="type.recycling.batteries">Baterie</string>
     <string name="type.recycling.clothes">Staré oblečení</string>

android/sdk/src/main/res/values-da/types_strings.xml

@@ -114,6 +114,7 @@
     <string name="type.amenity.public_bookcase">Bogbytteskab</string>
     <!-- SECTION: Types: Recycling -->
     <string name="type.amenity.recycling.centre">Genbrugsplads</string>
+    <string name="type.amenity.recycling">Genbrugscontainer</string>
     <string name="type.amenity.recycling.container">Genbrugscontainer</string>
     <string name="type.recycling.batteries">Batterier</string>
     <string name="type.recycling.clothes">Tekstil</string>

android/sdk/src/main/res/values-de/types_strings.xml

@@ -131,6 +131,7 @@
     <string name="type.amenity.public_bookcase">Bücherschrank</string>
     <!-- SECTION: Types: Recycling -->
     <string name="type.amenity.recycling.centre">Recyclinghof</string>
+    <string name="type.amenity.recycling">Wertstoffcontainer</string>
     <string name="type.amenity.recycling.container">Wertstoffcontainer</string>
     <string name="type.recycling.batteries">Batterien</string>
     <string name="type.recycling.clothes">Altkleider</string>

android/sdk/src/main/res/values-el/types_strings.xml

@@ -122,6 +122,7 @@
     <string name="type.amenity.public_bookcase">Ανταλλαγή βιβλίων</string>
     <!-- SECTION: Types: Recycling -->
     <string name="type.amenity.recycling.centre">Κέντρο ανακύκλωσης</string>
+    <string name="type.amenity.recycling">Κάδος ανακύκλωσης</string>
     <string name="type.amenity.recycling.container">Κάδος ανακύκλωσης</string>
     <string name="type.recycling.batteries">Μπαταρίες</string>
     <string name="type.recycling.clothes">Ρούχα</string>

android/sdk/src/main/res/values-et/types_strings.xml

@@ -131,6 +131,7 @@
     <string name="type.amenity.public_bookcase">Avalik raamaturiiul</string>
     <!-- SECTION: Types: Recycling -->
     <string name="type.amenity.recycling.centre">Jäätmejaam</string>
+    <string name="type.amenity.recycling">Taaskasutuskonteiner</string>
     <string name="type.amenity.recycling.container">Taaskasutuskonteiner</string>
     <string name="type.recycling.batteries">Patareid</string>
     <string name="type.recycling.clothes">Rõivad</string>

android/sdk/src/main/res/values-eu/types_strings.xml

@@ -129,6 +129,7 @@
     <string name="type.amenity.public_bookcase">Liburu trukea</string>
     <!-- SECTION: Types: Recycling -->
     <string name="type.amenity.recycling.centre">Birziklapen zentroa</string>
+    <string name="type.amenity.recycling">Birziklatzeko edukiontzia</string>
     <string name="type.amenity.recycling.container">Birziklatzeko edukiontzia</string>
     <string name="type.recycling.batteries">Bateriak</string>
     <string name="type.recycling.clothes">Arropa</string>

android/sdk/src/main/res/values-fa/types_strings.xml

@@ -115,6 +115,7 @@
     <string name="type.amenity.pub">میکده</string>
     <!-- SECTION: Types: Recycling -->
     <string name="type.amenity.recycling.centre">مرکز بازیافت</string>
+    <string name="type.amenity.recycling">ظرف بازیافت</string>
     <string name="type.amenity.recycling.container">ظرف بازیافت</string>
     <string name="type.recycling.batteries">ﺎﻫ ﯼﺮﺗﺎﺑ</string>
     <string name="type.recycling.clothes">لباسهای قدیمی</string>

android/sdk/src/main/res/values-fi/types_strings.xml

@@ -128,6 +128,7 @@
     <string name="type.amenity.public_bookcase">Kirjahylly</string>
     <!-- SECTION: Types: Recycling -->
     <string name="type.amenity.recycling.centre">Kierrätyskeskus</string>
+    <string name="type.amenity.recycling">Kierrätysjäteastia</string>
     <string name="type.amenity.recycling.container">Kierrätysjäteastia</string>
     <string name="type.recycling.batteries">Paristot</string>
     <string name="type.recycling.clothes">Vaatteet</string>

android/sdk/src/main/res/values-gl/types_strings.xml

@@ -138,6 +138,7 @@
     <string name="type.amenity.pub">Pub</string>
     <string name="type.amenity.public_bookcase">Intercambio de libros</string>
     <string name="type.amenity.recycling.centre">Centro de reciclaxe</string>
+    <string name="type.amenity.recycling">Contedora de reciclaxe</string>
     <string name="type.amenity.recycling.container">Contedora de reciclaxe</string>
     <string name="type.recycling.batteries">Baterías</string>
     <string name="type.recycling.clothes">Roupa</string>

android/sdk/src/main/res/values-gsw/types_strings.xml

@@ -131,6 +131,7 @@
     <string name="type.amenity.pub">Beiz</string>
     <string name="type.amenity.public_bookcase">Büecherschrank</string>
     <string name="type.amenity.recycling.centre">Recyclinghof</string>
+    <string name="type.amenity.recycling">Recyclingcontainer</string>
     <string name="type.amenity.recycling.container">Recyclingcontainer</string>
     <string name="type.recycling.batteries">Batterie</string>
     <string name="type.recycling.clothes">Altchleider</string>

android/sdk/src/main/res/values-hi/types_strings.xml

@@ -97,6 +97,7 @@
     <string name="type.amenity.public_bookcase">सार्वजनिक किताबों की अलमारी</string>
     <!-- SECTION: Types: Recycling -->
     <string name="type.amenity.recycling.centre">रीसाइक्लिंग सेंटर</string>
+    <string name="type.amenity.recycling">रीसाइक्लिंग कंटेनर</string>
     <string name="type.amenity.recycling.container">रीसाइक्लिंग कंटेनर</string>
     <string name="type.amenity.restaurant">रेस्तरां</string>
     <string name="type.amenity.sanitary_dump_station">सेनेटरी डंप स्टेशन</string>

android/sdk/src/main/res/values-hu/types_strings.xml

@@ -117,6 +117,7 @@
     <string name="type.amenity.public_bookcase">Nyilvános könyvespolc</string>
     <!-- SECTION: Types: Recycling -->
     <string name="type.amenity.recycling.centre">Hulladékudvar</string>
+    <string name="type.amenity.recycling">Szelektív hulladékgyűjtés</string>
     <string name="type.amenity.recycling.container">Szelektív hulladékgyűjtő konténer</string>
     <string name="type.recycling.batteries">Elem, akkumulátor</string>
     <string name="type.recycling.clothes">Ruha</string>

android/sdk/src/main/res/values-in/types_strings.xml

@@ -112,6 +112,7 @@
     <string name="type.amenity.public_bookcase">Rak Buku</string>
     <!-- SECTION: Types: Recycling -->
     <string name="type.amenity.recycling.centre">TPA</string>
+    <string name="type.amenity.recycling">Wadah daur ulang</string>
     <string name="type.amenity.recycling.container">Wadah daur ulang</string>
     <string name="type.recycling.batteries">Baterai</string>
     <string name="type.recycling.clothes">Pakaian lama</string>

android/sdk/src/main/res/values-is/types_strings.xml

@@ -35,6 +35,7 @@
     <string name="type.amenity.pub">Krá</string>
     <string name="type.amenity.public_bookcase">Bókaskipti</string>
     <string name="type.amenity.recycling.centre">Endurvinnslustöð</string>
+    <string name="type.amenity.recycling">Endurvinnslugámur</string>
     <string name="type.recycling.plastic_bottles">Plastflöskur</string>
     <string name="type.recycling.scrap_metal">Brotajárn</string>
     <string name="type.amenity.school">Skóli</string>

android/sdk/src/main/res/values-iw/types_strings.xml

@@ -129,6 +129,7 @@
     <string name="type.amenity.public_bookcase">כוננית ספרים ציבורית</string>
     <!-- SECTION: Types: Recycling -->
     <string name="type.amenity.recycling.centre">מרכז מיחזור</string>
+    <string name="type.amenity.recycling">מיכל מיחזור</string>
     <string name="type.amenity.recycling.container">מיכל מיחזור</string>
     <string name="type.recycling.batteries">סוללות</string>
     <string name="type.recycling.clothes">בגדים</string>

android/sdk/src/main/res/values-ko/types_strings.xml

@@ -117,6 +117,7 @@
     <string name="type.amenity.public_bookcase">도서 교환</string>
     <!-- SECTION: Types: Recycling -->
     <string name="type.amenity.recycling.centre">재활용센터</string>
+    <string name="type.amenity.recycling">재활용 쓰레기통</string>
     <string name="type.amenity.recycling.container">재활용 쓰레기통</string>
     <string name="type.recycling.batteries">배터리</string>
     <string name="type.recycling.clothes">낡은 옷</string>

android/sdk/src/main/res/values-mr/types_strings.xml

@@ -112,6 +112,7 @@
     <string name="type.amenity.pub">पब</string>
     <!-- SECTION: Types: Recycling -->
     <string name="type.amenity.recycling.centre">भंगार केंद्र</string>
+    <string name="type.amenity.recycling">रीसायकलिंग कंटेनर</string>
     <string name="type.amenity.recycling.container">रीसायकलिंग कंटेनर</string>
     <string name="type.recycling.batteries">घरगुती बॅटरी</string>
     <string name="type.recycling.clothes">कपडे</string>

android/sdk/src/main/res/values-nl/types_strings.xml

@@ -130,6 +130,7 @@
     <string name="type.amenity.public_bookcase">Boekenkast</string>
     <!-- SECTION: Types: Recycling -->
     <string name="type.amenity.recycling.centre">Milieustraat</string>
+    <string name="type.amenity.recycling">Recycling container</string>
     <string name="type.amenity.recycling.container">Recycling container</string>
     <string name="type.recycling.batteries">Batterijen</string>
     <string name="type.recycling.clothes">Oude kleding</string>

android/sdk/src/main/res/values-pl/types_strings.xml

@@ -131,6 +131,7 @@
     <string name="type.amenity.public_bookcase">Wymiana książek</string>
     <!-- SECTION: Types: Recycling -->
     <string name="type.amenity.recycling.centre">Centrum przetwórstwa odpadów</string>
+    <string name="type.amenity.recycling">Pojemnik do recyklingu</string>
     <string name="type.amenity.recycling.container">Pojemnik do recyklingu</string>
     <string name="type.recycling.batteries">Baterie</string>
     <string name="type.recycling.clothes">Stare ubrania</string>

android/sdk/src/main/res/values-pt-rBR/types_strings.xml

@@ -110,6 +110,7 @@
     <string name="type.amenity.public_bookcase">Biblioteca livre</string>
     <!-- SECTION: Types: Recycling -->
     <string name="type.amenity.recycling.centre">Centro de reciclagem</string>
+    <string name="type.amenity.recycling">Contêiner de reciclagem</string>
     <string name="type.amenity.recycling.container">Contêiner de reciclagem</string>
     <string name="type.recycling.batteries">Baterias</string>
     <string name="type.recycling.clothes">Roupas velhas</string>

android/sdk/src/main/res/values-ro/types_strings.xml

@@ -110,6 +110,7 @@
     <string name="type.amenity.public_bookcase">Bibliotecă</string>
     <!-- SECTION: Types: Recycling -->
     <string name="type.amenity.recycling.centre">Centru de reciclare</string>
+    <string name="type.amenity.recycling">Containere pentru reciclare</string>
     <string name="type.amenity.recycling.container">Containere pentru reciclare</string>
     <string name="type.recycling.batteries">Baterii</string>
     <string name="type.recycling.clothes">Haine vechi</string>

android/sdk/src/main/res/values-ru/types_strings.xml

@@ -131,6 +131,7 @@
     <string name="type.amenity.public_bookcase">Книгообмен</string>
     <!-- SECTION: Types: Recycling -->
     <string name="type.amenity.recycling.centre">Приём вторсырья</string>
+    <string name="type.amenity.recycling">Контейнер для вторсырья</string>
     <string name="type.amenity.recycling.container">Контейнер для вторсырья</string>
     <string name="type.recycling.batteries">Батарейки</string>
     <string name="type.recycling.clothes">Одежда</string>

android/sdk/src/main/res/values-sk/types_strings.xml

@@ -125,6 +125,7 @@
     <string name="type.amenity.public_bookcase">Knižná búdka</string>
     <!-- SECTION: Types: Recycling -->
     <string name="type.amenity.recycling.centre">Zberné suroviny</string>
+    <string name="type.amenity.recycling">Recyklačný kontajner</string>
     <string name="type.amenity.recycling.container">Recyklačný kontajner</string>
     <string name="type.recycling.batteries">Batérie</string>
     <string name="type.recycling.clothes">Staré oblečenie</string>

android/sdk/src/main/res/values-sr/types_strings.xml

@@ -130,6 +130,7 @@
     <string name="type.amenity.public_bookcase">Размена књига</string>
     <!-- SECTION: Types: Recycling -->
     <string name="type.amenity.recycling.centre">Центар за рециклажу</string>
+    <string name="type.amenity.recycling">Контејнер за рециклажу</string>
     <string name="type.amenity.recycling.container">Контејнер за рециклажу</string>
     <string name="type.recycling.batteries">Бетерије</string>
     <string name="type.recycling.clothes">Стара одећа</string>

android/sdk/src/main/res/values-sv/types_strings.xml

@@ -115,6 +115,7 @@
     <string name="type.amenity.public_bookcase">Bokskåp</string>
     <!-- SECTION: Types: Recycling -->
     <string name="type.amenity.recycling.centre">Återvinningscentral</string>
+    <string name="type.amenity.recycling">Behållare för återvinningsbart avfall</string>
     <string name="type.amenity.recycling.container">Behållare för återvinningsbart avfall</string>
     <string name="type.recycling.batteries">Batterier</string>
     <string name="type.recycling.clothes">Gamla kläder</string>

android/sdk/src/main/res/values-ta/types_strings.xml

@@ -146,6 +146,7 @@
     <string name="type.amenity.pub">பப்</string>
     <string name="type.amenity.public_bookcase">புத்தக பரிமாற்றம்</string>
     <string name="type.amenity.recycling.centre">மறுசுழற்சி நடுவண்</string>
+    <string name="type.amenity.recycling">மறுசுழற்சி கொள்கலன்</string>
     <string name="type.amenity.recycling.container">மறுசுழற்சி கொள்கலன்</string>
     <string name="type.recycling.batteries">பேட்டரிகள்</string>
     <string name="type.recycling.clothes">ஆடைகள்</string>

android/sdk/src/main/res/values-th/types_strings.xml

@@ -118,6 +118,7 @@
     <string name="type.amenity.public_bookcase">ตู้หนังสือ สถานที่แลกเปลี่ยนหนังสือ</string>
     <!-- SECTION: Types: Recycling -->
     <string name="type.amenity.recycling.centre">ศูนย์รีไซเคิล</string>
+    <string name="type.amenity.recycling">บรรจุภัณฑ์รีไซเคิล</string>
     <string name="type.amenity.recycling.container">บรรจุภัณฑ์รีไซเคิล</string>
     <string name="type.recycling.batteries">แบตเตอรี่</string>
     <string name="type.recycling.clothes">เสื้อผ้าเก่า</string>

android/sdk/src/main/res/values-tr/types_strings.xml

@@ -131,6 +131,7 @@
     <string name="type.amenity.public_bookcase">Kitap Değişimi</string>
     <!-- SECTION: Types: Recycling -->
     <string name="type.amenity.recycling.centre">Geri Dönüşüm Merkezi</string>
+    <string name="type.amenity.recycling">Atık Toplama Merkezi</string>
     <string name="type.amenity.recycling.container">Atık Toplama Merkezi</string>
     <string name="type.recycling.batteries">Piller</string>
     <string name="type.recycling.clothes">Kıyafet</string>

android/sdk/src/main/res/values-uk/types_strings.xml

@@ -131,6 +131,7 @@
     <string name="type.amenity.public_bookcase">Книгообмін</string>
     <!-- SECTION: Types: Recycling -->
     <string name="type.amenity.recycling.centre">Прийом вторсировини</string>
+    <string name="type.amenity.recycling">Контейнер для вторсировини</string>
     <string name="type.amenity.recycling.container">Контейнер для вторсировини</string>
     <string name="type.recycling.batteries">Батарейки</string>
     <string name="type.recycling.clothes">Одяг</string>

android/sdk/src/main/res/values-vi/types_strings.xml

@@ -117,6 +117,7 @@
     <string name="type.amenity.public_bookcase">Kệ sách</string>
     <!-- SECTION: Types: Recycling -->
     <string name="type.amenity.recycling.centre">Trung tâm tái sinh</string>
+    <string name="type.amenity.recycling">Thùng rác</string>
     <string name="type.amenity.recycling.container">Thùng rác</string>
     <string name="type.recycling.batteries">Ắc quy</string>
     <string name="type.recycling.clothes">Quần áo cũ</string>

android/sdk/src/main/res/values/types_strings.xml

@@ -154,7 +154,8 @@
     <string name="type.amenity.pub">Pub</string>
     <string name="type.amenity.public_bookcase">Book Exchange</string>
     <!-- SECTION: Types: Recycling -->
-    <string name="type.amenity.recycling.centre">Recycling Centre</string>
+    <string name="type.amenity.recycling.centre">Recycling Center</string>
+    <string name="type.amenity.recycling">Recycling Container</string>
     <string name="type.amenity.recycling.container">Recycling Container</string>
     <string name="type.recycling.batteries">Batteries</string>
     <string name="type.recycling.clothes">Clothes</string>

data/categories-strings/ar.json/localize.json

@@ -162,7 +162,7 @@
 "amenity-vehicle_inspection": "فحص المركبة",
 "amenity-waste_disposal": "قمامة|مهملات|سلة مهملات|صندوق قمامة",
 "amenity-recycling-centre|@category_recycling": "مركز إعادة تدوير",
-"amenity-recycling-container|@category_recycling": "حاوية لإعادة التدوير",
+"amenity-recycling-container|amenity-recycling|@category_recycling": "حاوية لإعادة التدوير",
 "recycling-batteries|@category_recycling": "ﺕﺎﻳﺭﺎﻄﺑ|بطاريات",
 "recycling-clothes|@category_recycling": "إعادة تدوير الملابس القديم|ملابس قديمة|ملابس",
 "recycling-glass_bottles|@category_recycling": "زجاجات زجاجية",

data/categories-strings/be.json/localize.json

@@ -109,7 +109,7 @@
 "amenity-post_office|post_office-post_partner|@category_post": "3Паштовае аддзяленне",
 "amenity-vehicle_inspection": "Тэхагляд аўтамабіля",
 "amenity-recycling-centre|@category_recycling": "5Пункт прыёму другаснай сыравіны",
-"amenity-recycling-container|@category_recycling": "Кантэйнер для другаснай сыравіны",
+"amenity-recycling-container|amenity-recycling|@category_recycling": "Кантэйнер для другаснай сыравіны",
 "recycling-batteries|@category_recycling": "5Прыём батарэек|Утылізацыя батарэек|5Перапрацоўка батарэек|5Здаць батарэйкі|4Збор батарэек|5Батарэйкі",
 "recycling-clothes|@category_recycling": "5Прыём адзення|Старае адзенне|Здаць непатрэбныя рэчы|Здаць рэчы|5Здаць адзенне",
 "recycling-glass_bottles|@category_recycling": "5Прыём шклатары|Прыём шкла|5Перапрацоўка шкла|5Здаць шклатару|Здаць бутэлькі|4Збор шклотары|5Шклатара|Шклабало|Шкляныя бутэлькі",

data/categories-strings/bg.json/localize.json

@@ -159,7 +159,7 @@
 "amenity-vehicle_inspection": "Проверка на автомобила",
 "amenity-waste_disposal": "Боклук|кош|контейнер|отпадък|бунище",
 "amenity-recycling-centre|@category_recycling": "Рециклиране|разделно събиране|Преработвателно средище",
-"amenity-recycling-container|@category_recycling": "Контейнер|разделно|събиране|Кофи за преработваем отпадък",
+"amenity-recycling-container|amenity-recycling|@category_recycling": "Контейнер|разделно|събиране|Кофи за преработваем отпадък",
 "recycling-batteries|@category_recycling": "Батерии",
 "recycling-clothes|@category_recycling": "Стари дрехи|рециклиране|",
 "recycling-glass_bottles|@category_recycling": "Стъкло|шише|рециклиране",

data/categories-strings/cs.json/localize.json

@@ -159,7 +159,7 @@
 "amenity-vehicle_inspection": "Kontrola vozidla",
 "amenity-waste_disposal": "Odpadky|koš|popelnice|uložiště odpadu",
 "amenity-recycling-centre|@category_recycling": "Recyklační středisko",
-"amenity-recycling-container|@category_recycling": "Recyklační nádoba",
+"amenity-recycling-container|amenity-recycling|@category_recycling": "Recyklační nádoba",
 "recycling-batteries|@category_recycling": "Baterie",
 "recycling-clothes|@category_recycling": "Staré oblečení|Recyklujte staré oblečení",
 "recycling-glass_bottles|@category_recycling": "Skleněné lahve",

data/categories-strings/da.json/localize.json

@@ -159,7 +159,7 @@
 "amenity-vehicle_inspection": "Bilsyn",
 "amenity-waste_disposal": "Bortskaffelse af affald|skraldespand|skrald",
 "amenity-recycling-centre|@category_recycling": "Genbrugsplads",
-"amenity-recycling-container|@category_recycling": "Genbrugscontainer",
+"amenity-recycling-container|amenity-recycling|@category_recycling": "Genbrugscontainer",
 "recycling-batteries|@category_recycling": "Batterier",
 "recycling-clothes|@category_recycling": "Gammelt tøj|Genbrug gammelt tøj|Tekstil",
 "recycling-glass_bottles|@category_recycling": "Glasflasker",

data/categories-strings/de.json/localize.json

@@ -172,7 +172,7 @@
 "amenity-vehicle_inspection": "Fahrzeuginspektion",
 "amenity-waste_disposal": "4Müllcontainer|Mülltonne|Abfälle|Müll|Müllentsorgung",
 "amenity-recycling-centre|@category_recycling": "3Recyclinghof|3Recyclingzentrum|3Wertstoffhof|U+1F6AE|U+267B",
-"amenity-recycling-container|@category_recycling": "3Wertstoffcontainer|3Recyclingbehälter|3Container|U+1F6AE|U+267B",
+"amenity-recycling-container|amenity-recycling|@category_recycling": "3Wertstoffcontainer|3Recyclingbehälter|3Container|U+1F6AE|U+267B",
 "recycling-batteries|@category_recycling": "Batterien",
 "recycling-clothes|@category_recycling": "3Altkleider|3Alte Kleidung|3Kleiderspende|3Altkleidercontainer",
 "recycling-glass_bottles|@category_recycling": "4Glas-Container|3Glasflaschen|3Altglas",

data/categories-strings/el.json/localize.json

@@ -160,7 +160,7 @@
 "amenity-vehicle_inspection": "Έλεγχος οχήματος",
 "amenity-waste_disposal": "Διαχείριση απορριμμάτων|σκουπίδια",
 "amenity-recycling-centre|@category_recycling": "Κέντρο ανακύκλωσης",
-"amenity-recycling-container|@category_recycling": "Κάδος ανακύκλωσης",
+"amenity-recycling-container|amenity-recycling|@category_recycling": "Κάδος ανακύκλωσης",
 "recycling-batteries|@category_recycling": "Μπαταρίες",
 "recycling-clothes|@category_recycling": "Παλιά ρούχα|Ανακύκλωση παλαιών ρούχων",
 "recycling-glass_bottles|@category_recycling": "Γυάλινα μπουκάλια",

data/categories-strings/en.json/localize.json

@@ -182,7 +182,7 @@
 "amenity-vehicle_inspection": "Vehicle Inspection",
 "amenity-waste_disposal": "4Dumpster|4Trash bin|4garbage bin|waste disposal|U+1F6AE",
 "amenity-recycling-centre|@category_recycling": "4Recycling Centre|Tip|Dump|U+1F6AE|U+267B",
-"amenity-recycling-container|@category_recycling": "4Recycling Container|U+1F6AE|U+267B",
+"amenity-recycling-container|amenity-recycling|@category_recycling": "4Recycling Container|U+1F6AE|U+267B",
 "recycling-batteries|@category_recycling": "4Recycling of Batteries|Household Batteries Disposal|Household Battery Disposal|4Batteries Disposal|Battery Disposal|Batteries Recycling|Battery Recycling|Batteries",
 "recycling-clothes|@category_recycling": "4Recycling of Clothes|Clothes Recycling|Textile Recycling|Donate Clothes|Clothes Collection Bin|Clothes",
 "recycling-glass_bottles|@category_recycling": "4Recycling of Glass Bottles|4Glass Bottles Recycling|Glass Waste",

data/categories-strings/es-MX.json/localize.json

@@ -1,7 +1,7 @@
 {
 "@category_recycling": "Reciclaje|Reciclaje de desechos|Eliminación de desechos|Materiales reciclables|Recogida separada de basura|Clasificación de desechos|Reutilización",
 "shop-houseware|@shop": "Enseres domésticos|Tienda de artículos para el hogar",
-"amenity-recycling-container|@category_recycling": "Contenedor de reciclaje",
+"amenity-recycling-container|amenity-recycling|@category_recycling": "Contenedor de reciclaje",
 "recycling-clothes|@category_recycling": "Ropa vieja|Reciclaje de cosas innecesarias|Ropa",
 "recycling-glass_bottles|@category_recycling": "Envase de vidrio",
 "recycling-paper|@category_recycling": "Desechos de papel|Papel",

data/categories-strings/es.json/localize.json

@@ -169,7 +169,7 @@
 "amenity-vehicle_inspection": "Inspección de vehículos|inspección vehicular|ITV",
 "amenity-waste_disposal": "Basura|Basurero|Cubo de basura|Contenedor de basura",
 "amenity-recycling-centre|@category_recycling": "Centro de reciclaje|punto limpio|punto verde|5Punto de reciclaje|ecoparque",
-"amenity-recycling-container|@category_recycling": "Contenedor de reciclaje",
+"amenity-recycling-container|amenity-recycling|@category_recycling": "Contenedor de reciclaje",
 "recycling-batteries|@category_recycling": "Baterías|Pilas|Reciclaje de baterías|10Reciclaje de pilas",
 "recycling-clothes|@category_recycling": "10Reciclaje de ropa|Reciclaje textil",
 "recycling-glass_bottles|@category_recycling": "Cascos de botellas|10Reciclaje de vidrio|Vidrio",

data/categories-strings/et.json/localize.json

@@ -166,7 +166,7 @@
 "amenity-vehicle_inspection": "Sõiduki ülevaatus",
 "amenity-waste_disposal": "Prügikast",
 "amenity-recycling-centre|@category_recycling": "Taaskasutuskeskus|Jäätmejaam",
-"amenity-recycling-container|@category_recycling": "Prügikonteiner",
+"amenity-recycling-container|amenity-recycling|@category_recycling": "Prügikonteiner",
 "recycling-batteries|@category_recycling": "Patareid",
 "recycling-clothes|@category_recycling": "Rõivaste taaskasutus|Rõivad",
 "recycling-glass_bottles|@category_recycling": "Taarapunkt",

data/categories-strings/eu.json/localize.json

@@ -159,7 +159,7 @@
 "amenity-vehicle_inspection": "Ibilgailuen Ikuskapena",
 "amenity-waste_disposal": "Zaborrontzia",
 "amenity-recycling-centre|@category_recycling": "Birziklatze zentroa|garbigune|Birziklapen zentroa",
-"amenity-recycling-container|@category_recycling": "Birziklatzeko edukiontzia",
+"amenity-recycling-container|amenity-recycling|@category_recycling": "Birziklatzeko edukiontzia",
 "recycling-batteries|@category_recycling": "Bateriak",
 "recycling-clothes|@category_recycling": "Arropa zaharra|Alferrikako gauzak birziklatzea|Arropa",
 "recycling-glass_bottles|@category_recycling": "Botila kaskoak",

data/categories-strings/fa.json/localize.json

@@ -160,7 +160,7 @@
 "amenity-vehicle_inspection": "بازرسی وسایل نقلیه",
 "amenity-waste_disposal": "زباله دانی",
 "amenity-recycling-centre|@category_recycling": "مرکز بازیافت",
-"amenity-recycling-container|@category_recycling": "ظرف بازیافت",
+"amenity-recycling-container|amenity-recycling|@category_recycling": "ظرف بازیافت",
 "recycling-batteries|@category_recycling": "ﺎﻫ ﯼﺮﺗﺎﺑ",
 "recycling-clothes|@category_recycling": "بازیافت لباسهای قدیمی|لباسهای قدیمی",
 "recycling-glass_bottles|@category_recycling": "بطریهای شیشهای",

data/categories-strings/fi.json/localize.json

@@ -158,7 +158,7 @@
 "amenity-vehicle_inspection": "Ajoneuvon tarkastus",
 "amenity-waste_disposal": "Roska",
 "amenity-recycling-centre|@category_recycling": "Kierrätyskeskus",
-"amenity-recycling-container|@category_recycling": "Kierrätysjäteastia",
+"amenity-recycling-container|amenity-recycling|@category_recycling": "Kierrätysjäteastia",
 "recycling-batteries|@category_recycling": "Paristot",
 "recycling-clothes|@category_recycling": "Vanhat vaatteet|Jätä tarpeettomat tavarat tähän|Vaatteet",
 "recycling-glass_bottles|@category_recycling": "Lasipullot",

data/categories-strings/fr.json/localize.json

@@ -167,7 +167,7 @@
 "amenity-vehicle_inspection": "Inspection de véhicule|Contrôle technique",
 "amenity-waste_disposal": "Déchets|poubelle|déchet",
 "amenity-recycling-centre|@category_recycling": "Centre de recyclage|Déchetterie|Déchèterie",
-"amenity-recycling-container|@category_recycling": "Conteneur de recyclage|PAVE|Point d'apport volontaire",
+"amenity-recycling-container|amenity-recycling|@category_recycling": "Conteneur de recyclage|PAVE|Point d'apport volontaire",
 "recycling-batteries|@category_recycling": "Batteries",
 "recycling-clothes|@category_recycling": "Vêtements usagés",
 "recycling-glass_bottles|@category_recycling": "Verre|bouteille|bocaux",

data/categories-strings/hi.json/localize.json

@@ -135,7 +135,7 @@
 "amenity-post_office|post_office-post_partner|@category_post": "3डाकघर",
 "amenity-waste_disposal": "3कचरे के डिब्बे",
 "amenity-recycling-centre|@category_recycling": "4रीसाइक्लिंग सेंटर",
-"amenity-recycling-container|@category_recycling": "रीसाइक्लिंग कंटेनर",
+"amenity-recycling-container|amenity-recycling|@category_recycling": "रीसाइक्लिंग कंटेनर",
 "amenity-school": "4विदयालय|विद्यालय",
 "amenity-shelter": "4आश्रय",
 "amenity-shelter-basic_hut": "द्विवार्षिक झोपड़ी",

data/categories-strings/hu.json/localize.json

@@ -159,7 +159,7 @@
 "amenity-vehicle_inspection": "Gépjármű átvizsgálás",
 "amenity-waste_disposal": "Szemeteskonténer|Kuka|Hulladék|Szemét",
 "amenity-recycling-centre|@category_recycling": "Hulladékudvar|Újrahasznosító központ|hulladékgyűjtő központ",
-"amenity-recycling-container|@category_recycling": "Újrahasznosító tartály|Szelektív hulladékgyűjtő konténer",
+"amenity-recycling-container|amenity-recycling|@category_recycling": "Újrahasznosító tartály|Szelektív hulladékgyűjtő konténer",
 "recycling-batteries|@category_recycling": "Elemek|Elem, akkumulátor",
 "recycling-clothes|@category_recycling": "Régi ruhák|Régi ruhák újrahasznosítása|Ruha",
 "recycling-glass_bottles|@category_recycling": "Üveg palackok",

data/categories-strings/id.json/localize.json

@@ -154,7 +154,7 @@
 "amenity-vehicle_inspection": "Pemeriksaan kendaraan",
 "amenity-waste_disposal": "Sampah",
 "amenity-recycling-centre|@category_recycling": "TPA",
-"amenity-recycling-container|@category_recycling": "Wadah daur ulang",
+"amenity-recycling-container|amenity-recycling|@category_recycling": "Wadah daur ulang",
 "recycling-batteries|@category_recycling": "Baterai",
 "recycling-clothes|@category_recycling": "Pakaian lama|Mendaur ulang pakaian lama",
 "recycling-glass_bottles|@category_recycling": "Botol kaca",

data/categories-strings/it.json/localize.json

@@ -159,7 +159,7 @@
 "amenity-vehicle_inspection": "Ispezione del veicolo",
 "amenity-waste_disposal": "Spazzatura",
 "amenity-recycling-centre|@category_recycling": "Centro di riciclaggio",
-"amenity-recycling-container|@category_recycling": "Contenitore per materiali riciclabili",
+"amenity-recycling-container|amenity-recycling|@category_recycling": "Contenitore per materiali riciclabili",
 "recycling-batteries|@category_recycling": "Batterie",
 "recycling-clothes|@category_recycling": "Vestiti usati|Riciclare vestiti usati|Raccolta indumenti",
 "recycling-glass_bottles|@category_recycling": "Contenitori in vetro",

data/categories-strings/ja.json/localize.json

@@ -162,7 +162,7 @@
 "amenity-vehicle_inspection": "車検",
 "amenity-waste_disposal": "ゴミ|ごみ|リサイクル|再利用|ダストボックス",
 "amenity-recycling-centre|@category_recycling": "リサクルセンター",
-"amenity-recycling-container|@category_recycling": "リサイクルボックス",
+"amenity-recycling-container|amenity-recycling|@category_recycling": "リサイクルボックス",
 "recycling-batteries|@category_recycling": "バッテリー",
 "recycling-clothes|@category_recycling": "古着|古着のリサイクル",
 "recycling-glass_bottles|@category_recycling": "ガラス瓶",

data/categories-strings/ko.json/localize.json

@@ -157,7 +157,7 @@
 "amenity-vehicle_inspection": "차량검사",
 "amenity-waste_disposal": "쓰레기|휴지통",
 "amenity-recycling-centre|@category_recycling": "재활용센터|재활용 센터",
-"amenity-recycling-container|@category_recycling": "재활용 쓰레기통|재활용품통",
+"amenity-recycling-container|amenity-recycling|@category_recycling": "재활용 쓰레기통|재활용품통",
 "recycling-batteries|@category_recycling": "배터리",
 "recycling-clothes|@category_recycling": "낡은 옷|낡은 옷 재활|낡은 옷 재활용",
 "recycling-glass_bottles|@category_recycling": "유리병",

data/categories-strings/lv.json/localize.json

@@ -159,7 +159,7 @@
 "amenity-vehicle_inspection": "Transportlīdzekļu tehniskā apskate|tehniskā apskate|4CSDD",
 "amenity-waste_disposal": "Atkritumu tvertne|atkritumu konteiners|miskaste|U+1F6AE",
 "amenity-recycling-centre|@category_recycling": "Atkritumu pārstrādes centrs|pārstrādes centrs|izgāztuve|U+1F6AE|U+267B",
-"amenity-recycling-container|@category_recycling": "Pārstrādes konteiners|otrreizējas pārstrādes konteiners|U+1F6AE|U+267B",
+"amenity-recycling-container|amenity-recycling|@category_recycling": "Pārstrādes konteiners|otrreizējas pārstrādes konteiners|U+1F6AE|U+267B",
 "recycling-batteries|@category_recycling": "Bateriju utilizācija|bateriju pārstrāde|bateriju nodošana",
 "recycling-clothes|@category_recycling": "Tekstila konteiners|apģērba pārstrāde|drēbju pārsrāde|apģērba nodošana|drēbju nodošana|apģērba ziedošana",
 "recycling-glass_bottles|@category_recycling": "Stikla pārstrāde|stikla nodošana|stikla atkritumi",

data/categories-strings/mr.json/localize.json

@@ -154,7 +154,7 @@
 "amenity-vehicle_inspection": "वाहन तपासणी",
 "amenity-waste_disposal": "कचरापेटी",
 "amenity-recycling-centre|@category_recycling": "भंगारवाला|पुनर्वापर केंद्र|रिसायकल सेंटर|भंगार केंद्र",
-"amenity-recycling-container|@category_recycling": "रीसायकलिंग कंटेनर",
+"amenity-recycling-container|amenity-recycling|@category_recycling": "रीसायकलिंग कंटेनर",
 "recycling-batteries|@category_recycling": "बॅटर भंगारवाला|घरगुती बॅटरी",
 "recycling-clothes|@category_recycling": "कपडे भंगारवाला|कपडे",
 "recycling-glass_bottles|@category_recycling": "काचेच्या बाटल्यांचे पुनर्वापर",

data/categories-strings/nb.json/localize.json

@@ -156,7 +156,7 @@
 "amenity-vehicle_inspection": "Inspeksjon av kjøretøy",
 "amenity-waste_disposal": "4Søppeldunk|4søppel",
 "amenity-recycling-centre|@category_recycling": "Resirkuleringssenter|innsamlingsstasjon",
-"amenity-recycling-container|@category_recycling": "Gjenvinningsbeholder",
+"amenity-recycling-container|amenity-recycling|@category_recycling": "Gjenvinningsbeholder",
 "recycling-batteries|@category_recycling": "Batterier",
 "recycling-clothes|@category_recycling": "Gamle klær|Levere gamle klær",
 "recycling-glass_bottles|@category_recycling": "Glassemballasje",

data/categories-strings/nl.json/localize.json

@@ -164,7 +164,7 @@
 "amenity-vehicle_inspection": "Voertuiginspectie",
 "amenity-waste_disposal": "4Afvalcontainer|afval|prullenbak|vuilnis",
 "amenity-recycling-centre|@category_recycling": "Milieustraat|recycling centrum|milieupark|gemeentewerf",
-"amenity-recycling-container|@category_recycling": "Recycling container",
+"amenity-recycling-container|amenity-recycling|@category_recycling": "Recycling container",
 "recycling-batteries|@category_recycling": "Batterijen",
 "recycling-clothes|@category_recycling": "Oude kleding|Oude kleding recyclen",
 "recycling-glass_bottles|@category_recycling": "4Recycling van glasflessen|4Glasrecycling|Glasafval|Glascontainer|Glasbak",

data/categories-strings/pl.json/localize.json

@@ -166,7 +166,7 @@
 "amenity-vehicle_inspection": "Kontrola pojazdu",
 "amenity-waste_disposal": "Wysypisko|Śmieci|ponowne odtworzenie|odpady",
 "amenity-recycling-centre|@category_recycling": "Przetwarzanie odpadów|Centrum przetwórstwa odpadów",
-"amenity-recycling-container|@category_recycling": "Pojemnik do recyklingu",
+"amenity-recycling-container|amenity-recycling|@category_recycling": "Pojemnik do recyklingu",
 "recycling-batteries|@category_recycling": "Baterie",
 "recycling-clothes|@category_recycling": "Stare ubrania|Przekaż niepotrzebne rzeczy",
 "recycling-glass_bottles|@category_recycling": "Szkło",

data/categories-strings/pt-BR.json/localize.json

@@ -137,7 +137,7 @@
 "amenity-post_office|post_office-post_partner|@category_post": "3Correios",
 "amenity-waste_disposal": "Depósito de lixo|lixo",
 "amenity-recycling-centre|@category_recycling": "Reciclagem|descarte seletivo",
-"amenity-recycling-container|@category_recycling": "Recipiente de reciclagem",
+"amenity-recycling-container|amenity-recycling|@category_recycling": "Recipiente de reciclagem",
 "recycling-batteries|@category_recycling": "Baterias",
 "recycling-clothes|@category_recycling": "Roupas velhas|Reciclar roupas velhas",
 "recycling-glass_bottles|@category_recycling": "Garrafas de vidro",

data/categories-strings/pt.json/localize.json

@@ -163,7 +163,7 @@
 "amenity-vehicle_inspection": "Inspeção veicular",
 "amenity-waste_disposal": "Contentor do lixo|Caixote do lixo|lixo",
 "amenity-recycling-centre|@category_recycling": "Centro de reciclagem|Ecocentro",
-"amenity-recycling-container|@category_recycling": "Ecoponto|Contentor de reciclagem|Papelão|Vidrão|Embalão|Oleão|reciclagem",
+"amenity-recycling-container|amenity-recycling|@category_recycling": "Ecoponto|Contentor de reciclagem|Papelão|Vidrão|Embalão|Oleão|reciclagem",
 "recycling-batteries|@category_recycling": "Baterias",
 "recycling-clothes|@category_recycling": "Reciclagem de roupas|Roupas velhas",
 "recycling-glass_bottles|@category_recycling": "Resíduos de vidro",

data/categories-strings/ro.json/localize.json

@@ -155,7 +155,7 @@
 "amenity-vehicle_inspection": "Inspecția vehiculului",
 "amenity-waste_disposal": "Gunoi",
 "amenity-recycling-centre|@category_recycling": "Centru de reciclare",
-"amenity-recycling-container|@category_recycling": "Containere pentru reciclare",
+"amenity-recycling-container|amenity-recycling|@category_recycling": "Containere pentru reciclare",
 "recycling-batteries|@category_recycling": "Baterii",
 "recycling-clothes|@category_recycling": "Haine vechi|Înmânarea lucrurilor inutile",
 "recycling-glass_bottles|@category_recycling": "Deșeuri de sticlă",

data/categories-strings/ru.json/localize.json

@@ -167,7 +167,7 @@
 "amenity-vehicle_inspection": "Техосмотр автомобиля",
 "amenity-waste_disposal": "4Мусорный контейнер|мусорка",
 "amenity-recycling-centre|@category_recycling": "5Пункт приёма вторсырья",
-"amenity-recycling-container|@category_recycling": "Контейнер для вторсырья",
+"amenity-recycling-container|amenity-recycling|@category_recycling": "Контейнер для вторсырья",
 "recycling-batteries|@category_recycling": "5Приём батареек|Утилизация батареек|5Переработка батареек|5Сдать батарейки|4Сбор батареек|5Батарейки",
 "recycling-clothes|@category_recycling": "5Приём одежды|Старая одежда|Сдать ненужные вещи|Сдать вещи|5Сдать одежду|Одежда",
 "recycling-glass_bottles|@category_recycling": "5Приём стеклотары|Приём стекла|5Переработка стекла|5Сдать cтеклотару|Сдать бутылки|4Сбор стеклотары|5Стеклотара|Стеклобой|Стеклянные бутылки",

data/categories-strings/sk.json/localize.json

@@ -159,7 +159,7 @@
 "amenity-vehicle_inspection": "Kontrola vozidla",
 "amenity-waste_disposal": "Odpadky|kôš",
 "amenity-recycling-centre|@category_recycling": "Zberné suroviny",
-"amenity-recycling-container|@category_recycling": "Recyklačný odpad|Recyklačný kontajner",
+"amenity-recycling-container|amenity-recycling|@category_recycling": "Recyklačný odpad|Recyklačný kontajner",
 "recycling-batteries|@category_recycling": "Batérie",
 "recycling-clothes|@category_recycling": "Staré oblečenie|Recyklácia starých šiat",
 "recycling-glass_bottles|@category_recycling": "Sklenené fľaše",

data/categories-strings/sr.json/localize.json

@@ -128,7 +128,7 @@
 "amenity-vehicle_inspection": "8Технички преглед возила|8Tehnički pregled vozila",
 "amenity-waste_disposal": "Контејнер за смеће|Kontejner za smeće",
 "amenity-recycling-centre|@category_recycling": "Рециклажни центар|Reciklažni centar",
-"amenity-recycling-container|@category_recycling": "Рециклажни контејнер|Reciklažni kontejner",
+"amenity-recycling-container|amenity-recycling|@category_recycling": "Рециклажни контејнер|Reciklažni kontejner",
 "recycling-batteries|@category_recycling": "Рециклажа батерија|Reciklaža baterija",
 "recycling-clothes|@category_recycling": "Рециклажа одеће|Reciklaža odeće",
 "recycling-glass_bottles|@category_recycling": "Рециклажа стакла|Reciklaža stakla",

data/categories-strings/sv.json/localize.json

@@ -161,7 +161,7 @@
 "amenity-vehicle_inspection": "Fordonsinspektion",
 "amenity-waste_disposal": "4Avfallscontainer|Soptunna|skräp|avfall",
 "amenity-recycling-centre|@category_recycling": "Återvinningscentral",
-"amenity-recycling-container|@category_recycling": "Behållare för återvinningsbart avfall",
+"amenity-recycling-container|amenity-recycling|@category_recycling": "Behållare för återvinningsbart avfall",
 "recycling-batteries|@category_recycling": "Batterier",
 "recycling-clothes|@category_recycling": "Gamla kläder|Överlämna onödiga saker",
 "recycling-glass_bottles|@category_recycling": "Returglas",

data/categories-strings/th.json/localize.json

@@ -158,7 +158,7 @@
 "amenity-vehicle_inspection": "การตรวจสอบยานพาหนะ",
 "amenity-waste_disposal": "ขยะ|ถังขยะ",
 "amenity-recycling-centre|@category_recycling": "ศูนย์รีไซเคิล",
-"amenity-recycling-container|@category_recycling": "บรรจุภัณฑ์รีไซเคิล",
+"amenity-recycling-container|amenity-recycling|@category_recycling": "บรรจุภัณฑ์รีไซเคิล",
 "recycling-batteries|@category_recycling": "แบตเตอรี่",
 "recycling-clothes|@category_recycling": "เสื้อผ้าเก่า|รีไซเคิลเสื้อผ้าเก่า",
 "recycling-glass_bottles|@category_recycling": "ขวดแก้ว",

data/categories-strings/tr.json/localize.json

@@ -168,7 +168,7 @@
 "amenity-vehicle_inspection": "Araç muayenesi",
 "amenity-waste_disposal": "Çöplük|Çöp kutusu|çöp",
 "amenity-recycling-centre|@category_recycling": "4Geri dönüşüm merkezi",
-"amenity-recycling-container|@category_recycling": "4Geri Dönüşüm Kutusu|Atık Toplama Merkezi",
+"amenity-recycling-container|amenity-recycling|@category_recycling": "4Geri Dönüşüm Kutusu|Atık Toplama Merkezi",
 "recycling-batteries|@category_recycling": "3Piller|Atık Pil Toplama|Atık pil kutusu",
 "recycling-clothes|@category_recycling": "4Eski kıyafetler|Eski kıyafetler geri dönüşümü|Kıyafet toplama kutusu|giysi toplama kutusu|Kıyafet",
 "recycling-glass_bottles|@category_recycling": "4Cam şişeler Geri Dönüşümü",

data/categories-strings/uk.json/localize.json

@@ -164,7 +164,7 @@
 "amenity-vehicle_inspection": "Техогляд автомобіля",
 "amenity-waste_disposal": "4Сміттєвий контейнер|сміття|смітник",
 "amenity-recycling-centre|@category_recycling": "5Пункт прийому вторинної сировини",
-"amenity-recycling-container|@category_recycling": "Контейнер для вторсировини",
+"amenity-recycling-container|amenity-recycling|@category_recycling": "Контейнер для вторсировини",
 "recycling-batteries|@category_recycling": "5Прийом батарейок|Утилізація батарей|5Переробка батарей|5Здати батареї|4Збір батарейок|5Батарейки",
 "recycling-clothes|@category_recycling": "5Прийом одягу|Старий одяг|Здати непотрібні речі|Здати речі|5Здати одяг|Одяг",
 "recycling-glass_bottles|@category_recycling": "5Прийом склотари|Прийом скла|5Переробка скла|5Здати склотару|Здати пляшки|4Збір склотари|5Склотара|Склобой|Скляні пляшки",

data/categories-strings/vi.json/localize.json

@@ -155,7 +155,7 @@
 "amenity-vehicle_inspection": "Kiểm tra xe",
 "amenity-waste_disposal": "Xử lý chất thải|Rác",
 "amenity-recycling-centre|@category_recycling": "Trung tâm tái sinh",
-"amenity-recycling-container|@category_recycling": "Thùng rác",
+"amenity-recycling-container|amenity-recycling|@category_recycling": "Thùng rác",
 "recycling-batteries|@category_recycling": "Ắc quy",
 "recycling-clothes|@category_recycling": "Quần áo cũ|Chuyển giao những thứ không cần thiết",
 "recycling-glass_bottles|@category_recycling": "Chai lọ thủy tinh",

data/categories-strings/zh-Hans.json/localize.json

@@ -161,7 +161,7 @@
 "amenity-vehicle_inspection": "车辆检验",
 "amenity-waste_disposal": "垃圾",
 "amenity-recycling-centre|@category_recycling": "回收中心",
-"amenity-recycling-container|@category_recycling": "回收箱",
+"amenity-recycling-container|amenity-recycling|@category_recycling": "回收箱",
 "recycling-batteries|@category_recycling": "电池",
 "recycling-clothes|@category_recycling": "旧衣物|回收旧衣物",
 "recycling-glass_bottles|@category_recycling": "玻璃瓶",

data/categories-strings/zh-Hant.json/localize.json

@@ -162,7 +162,7 @@
 "amenity-vehicle_inspection": "車輛檢驗",
 "amenity-waste_disposal": "垃圾|回收|回收場",
 "amenity-recycling-centre|@category_recycling": "回收中心|回收站",
-"amenity-recycling-container|@category_recycling": "回收箱",
+"amenity-recycling-container|amenity-recycling|@category_recycling": "回收箱",
 "recycling-batteries|@category_recycling": "電池",
 "recycling-clothes|@category_recycling": "舊衣物|回收舊衣物|衣服",
 "recycling-glass_bottles|@category_recycling": "玻璃瓶",

data/mapcss-mapping.csv

@@ -15,11 +15,10 @@
 # a "forbidden" selector like [!oneway] matches [oneway=no] only or absence of this tag.
 # If first 2 (1 for short types like "building") components of pre-matched types are the same,
 # then leave only the longest types (there could be a few of them). Equal arity types are kept.
-# Types added to data/subtypes.csv are always kept, too.
 # - highway-primary-bridge is left while highway-primary is removed;
 # - building-garages is left while building is removed;
 # - amenity-parking-underground-fee is left while amenity-parking and amenity-parking-fee are removed;
-# - both highway-primary-bridge and highway-primary-tunnel are left;
+# - both amenity-charging_station-motorcar and amenity-charging_station-bicycle are left;
 #
 # A shorter format for the above example:
 #   highway|bus_stop;22;
@@ -198,8 +197,7 @@ landuse|cemetery;105;
 sport|soccer;106;
 moved:boundary|administrative|4:05.2024;[boundary=administrative][admin_level=4];x;;;107;boundary|administrative|4
 amenity|cafe;108;
-# Treat default type also as a container, see https://taginfo.openstreetmap.org/keys/recycling_type#values
-amenity|recycling|container;[amenity=recycling][recycling_type=container],[amenity=recycling][!recycling_type];;name;int_name;109;
+amenity|recycling|container;[amenity=recycling][recycling_type=container];;name;int_name;109;
 leisure|garden;110;
 landuse|commercial;111;
 moved:railway|station:05.2024;112;railway|station
@@ -343,7 +341,7 @@ amenity|parking|permissive;[amenity=parking][access=permissive];;name;int_name;2
 deprecated:boundary|administrative|5:04.2024;[boundary=administrative][admin_level=5];x;name;int_name;234;
 highway|unclassified|tunnel;[highway=unclassified][tunnel?];;name;int_name;235;
 amenity|recycling|centre;[amenity=recycling][recycling_type=centre];;name;int_name;236;
-deprecated:amenity|recycling:01.2026;237;amenity|recycling|container
+amenity|recycling;237;
 highway|residential|tunnel;[highway=residential][tunnel?];;name;int_name;238;
 aeroway|helipad;239;
 deprecated:highway|path|permissive:12.2023;[highway=path][access=permissive];x;name;int_name;240;highway|path
@@ -421,7 +419,6 @@ highway|primary_link|bridge;[highway=primary_link][bridge?];;name;int_name;310;
 man_made|tower|communication;[man_made=tower][tower:type=communication];;name;int_name;311;
 sport|equestrian;312;
 tourism|information|office;[tourism=information][information=office];;name;int_name;313;
-# This is needed in the generator to work around charing stations, which are only implicitly marked as for cars, but this type never will actually make it into the map data
 amenity|charging_station|carless;[amenity=charging_station][motorcar=not],[amenity=charging_station][motorcar=no];;name;int_name;314;
 aeroway|gate;315;
 # TODO: railway=preserved is deprecated in OSM, recommended mapping is railway:preserved=yes + railway=*
@@ -475,7 +472,6 @@ amenity|parking|multi-storey;[amenity=parking][parking=multi-storey];;name;int_n
 # TODO: its being replaced by landuse-recreation_ground, merge in there.
 leisure|recreation_ground;360;
 deprecated:highway|footway|mountain_hiking:04.2024;[highway=footway][sac_scale=mountain_hiking];x;name;int_name;361;highway|path
-# Workaround for (mis)uses of emergency access points to provide kind of an additional emergency address to each house, which without this would completely clutter the map. See https://codeberg.org/comaps/comaps/pulls/3220.
 emergency|access_point|address;[emergency=access_point][operator=helpbidea];;name;;362;
 amenity|parking|multi-storey|fee;[amenity=parking][parking=multi-storey][fee];;name;int_name;363;
 sport|9pin;364;

data/styles/default/dark/symbols/tram-m.svg

@@ -1 +1 @@
-<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><rect fill="#000" height="18" opacity=".6" rx="1.875" width="18"/><rect fill="#2f6499" height="16.5" rx="1.5" width="16.5" x=".75" y=".75"/><path d="m6.41350421 14.75c-.95 0-1.674375-.676875-1.7444375-1.6019375l-.0055625-.1480625v-.0833333l.25-6.1666667c0-.91666667.75-1.66666667 1.66666667-1.58333333h1.58333333v-.75c-.5 0-.91666667.16666666-1.08333333.16666666-.41666667.08333334-.83333334-.16666666-.91666667-.58333333s.08333333-.83333333.41666667-1l.11922451-.02060859c.27673179-.05556686.98917837-.2057297 1.91374923-.22689803l.38536266-.00204645-.00000307.26264718.00249272-.26264718.1683364-.00044693c1.24999997 0 2.16666667.25 2.24999997.25.3333334.16666667.5.58333333.4166667 1s-.5.66666667-.9166667.58333333c-.1666666 0-.5833333-.16666666-1.0833333-.16666666v.75h1.5833333c.8708334-.07916667 1.59125.59374999 1.6611146 1.44716666l.2555521 6.30283337v.0833333l-.0055625.1480625c-.0700625.9250625-.7944375 1.6019375-1.7444375 1.6019375zm.08333333-2.6666667c-.41666666 0-.75.3333334-.75.75 0 .4166667.33333334.75.75.75.41666667 0 .75-.4166666.75-.8333333s-.33333333-.6666667-.75-.6666667zm5.00582916 0c-.4166667 0-.75.25-.75.6666667s.3333333.8333333.75.8333333c.4166666 0 .75-.3333333.75-.75 0-.4166666-.3333334-.75-.75-.75zm-4.58916249-5.66666663c-.46428571 0-.85671769.3592687-.9104106.87764213l-.00625607.12235787-.08333333 2.41666666c0 .58333337.41666667.99999997.91666667.99999997h4.33916242c.5 0 .9166667-.4166666.9166667-.99999997l-.0833333-2.41666666-.0062561-.12235787c-.0536929-.51837343-.4461249-.87764213-.9104106-.87764213z" fill="#000"/></g></svg>
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><rect fill="#000" height="18" opacity=".6" rx="1.875" width="18"/><rect fill="#2f6499" height="16.5" rx="1.5" width="16.5" x=".75" y=".75"/><path d="m12.9135042 6.75c-.0833333-1-.8333333-1.66666667-1.75-1.66666667h-1.49999999v-.75c.33333333 0 .74999999.08333334 1.16666669.16666667.3333333.08333333.6666667-.16666667.8333333-.58333333.0833334-.41666667-.1666666-.75-.5833333-.91666667-.75-.16666667-1.50000002-.25-2.16666669-.25h-.08333333c-1.25 0-2.16666667.25-2.25.25-.33333334.16666667-.5.58333333-.41666667 1s.5.66666667.91666667.58333333c.16666666 0 .58333333-.16666666 1.08333333-.16666666v.75h-1.58333333c-.91666667-.08333334-1.66666667.66666666-1.66666667 1.58333333l-.25 6.1666667v.0833333c0 1 .75 1.75 1.75 1.75h5.16666669.0833333c1-.0833333 1.75-.9166667 1.6666667-1.8333333zm-6.99999999 3.08333333.08333333-2.41666666c0-.58333334.41666667-1 .91666667-1h3.99999999c.5 0 .8333334.41666666.9166667 1l.0833333 2.41666666c0 .58333337-.3333333.99999997-.8333333.99999997h-.0833333-4.16666672c-.5 0-.91666667-.4166666-.91666667-.99999997zm.58333333 3.74999997c-.41666666 0-.75-.3333333-.75-.75 0-.4166666.33333334-.75.75-.75.41666667 0 .75.25.75.6666667s-.33333333.8333333-.75.8333333zm4.83333336 0c-.4166667 0-.75-.3333333-.75-.75 0-.4166666.3333333-.75.75-.75s.75.3333334.75.75c0 .3333334-.3333333.75-.75.75z" fill="#000"/></g></svg>

data/styles/default/dark/symbols/tram-s.svg

@@ -1 +1 @@
-<svg height="12" viewBox="0 0 12 12" width="12" xmlns="http://www.w3.org/2000/svg"><g fill="none"><rect fill="#000" height="12" opacity=".6" rx="1.875" width="12"/><rect fill="#2f6499" height="11.00025" rx="1.5" width="11.00025" x=".500003" y=".500003"/><path d="m5.99901368 2.00028841.27959242.00206521c.38744508.01070897.71530435.05601616.94321322.09555697l.34033345.06354774c.21527778.10763889.32291667.37673612.26909723.64583333-.04783951.23919754-.26577504.39334706-.50261012.38685034l-.14510611-.01607672-.26690051-.05931123c-.11014942-.02259475-.23865707-.04236516-.37704993-.04236516v.484375h1.02256944c.5525463-.05023148 1.01132716.3683642 1.07004218.90572943l.16780505 4.09947891v.05381944l-.00636265.12691821c-.05893828.58134568-.52106791 1.00329012-1.12384568 1.00329012h-3.34023687c-.60277777 0-1.0649074-.42194444-1.12384568-1.00329012l-.00636265-.12691821v-.05381944l.16145834-3.98263889c0-.59201389.484375-1.07638889 1.07638889-1.02256945h1.02256944v-.484375c-.27678572 0-.51403061.07908163-.64395044.10167639l-.05570234.0059625c-.26909722.05381945-.53819444-.10763889-.59201389-.37673612-.05381944-.26909721.05381945-.53819444.26909723-.64583333l.34033345-.06354774.25973069-.03996795c.19337167-.02593341.42518581-.04844971.68348253-.05558902zm-1.61563943 6.02748937c-.26909722 0-.484375.21527778-.484375.484375s.21527778.484375.484375.484375.484375-.26909722.484375-.53819445c0-.26909721-.21527778-.43055555-.484375-.43055555zm3.23259797 0c-.26909722 0-.484375.16145834-.484375.43055555 0 .26909723.21527778.53819445.484375.53819445s.484375-.21527778.484375-.484375-.21527778-.484375-.484375-.484375zm-.26909722-3.65972222h-2.69440353c-.29356061 0-.54264233.2223944-.58550379.54587716l-.00651009.09995617-.05381946 1.56076389c0 .37673611.26909723.64583334.59201389.64583334h2.80204243c.32291666 0 .59201389-.26909723.59201389-.64583334l-.05381946-1.56076389-.00651009-.09995617c-.04286146-.32348276-.29194318-.54587716-.58550379-.54587716z" fill="#000"/></g></svg>
+<svg height="12" viewBox="0 0 12 12" width="12" xmlns="http://www.w3.org/2000/svg"><g fill="none"><rect fill="#000" height="12" opacity=".6" rx="1.875" width="12"/><rect fill="#2f6499" height="11.00025" rx="1.5" width="11.00025" x=".500003" y=".500003"/><path d="m8.52747147 4.58333334c-.05381944-.64583334-.53819445-1.07638889-1.13020833-1.07638889h-.96875v-.48437501c.21527777 0 .484375.05381945.75347222.10763889.21527778.05381945.43055555-.10763889.53819445-.37673611.05381944-.26909722-.1076389-.484375-.37673612-.59201389-.484375-.10763889-.96874999-.16145833-1.39930555-.16145833h-.05381945c-.80729166 0-1.39930555.16145833-1.45312499.16145833-.21527778.10763889-.32291667.37673612-.26909723.64583333.05381945.26909723.32291667.43055557.59201389.37673612.10763889 0 .37673611-.10763889.69965278-.10763889v.484375h-1.02256944c-.59201389-.05381944-1.07638889.43055556-1.07638889 1.02256945l-.16145834 3.98263889v.05381944c0 .64583333.484375 1.13020833 1.13020833 1.13020833h3.33680556.05381945c.64583333-.05381944 1.13020833-.59201389 1.07638889-1.18402777zm-4.52083334 1.99131944.05381946-1.56076389c0-.37673611.26909721-.64583333.59201388-.64583333h2.58333333c.32291667 0 .53819445.26909722.5920139.64583333l.05381944 1.56076389c0 .37673611-.21527778.64583334-.53819445.64583334h-.05381944-2.69097223c-.32291666 0-.59201389-.26909723-.59201389-.64583334zm.37673612 2.421875c-.26909722 0-.484375-.21527778-.484375-.48437499 0-.26909723.21527778-.48437501.484375-.48437501s.484375.16145834.484375.43055555c0 .26909723-.21527778.53819445-.484375.53819445zm3.12152778 0c-.26909723 0-.484375-.21527778-.484375-.48437499 0-.26909723.21527777-.48437501.484375-.48437501.26909722 0 .48437499.21527778.48437499.48437501 0 .21527777-.21527777.48437499-.48437499.48437499z" fill="#000"/></g></svg>

data/styles/default/include/priorities_4_overlays.prio.txt

@@ -1144,6 +1144,7 @@ leisure-sports_hall                                 # icon z17- (also has captio
 amenity-compressed_air                              # icon z18- (also has caption(optional) z19-)
 amenity-parcel_locker                               # icon z17- (also has caption(optional) z17-)
 amenity-payment_terminal                            # icon z17- (also has caption(optional) z17-)
+amenity-recycling                                   # icon z17- (also has caption(optional) z18-)
 amenity-vending_machine-fuel                        # icon z18- (also has caption(optional) z18-)
 amenity-vending_machine-parking_tickets             # icon z17- (also has caption(optional) z17-)
 amenity-vending_machine-public_transport_tickets    # icon z17- (also has caption(optional) z17-)
@@ -2217,6 +2218,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # amenity-compressed_air                            # caption(optional) z19- (also has icon z18-)
 # amenity-parcel_locker                             # caption(optional) z17- (also has icon z17-)
 # amenity-payment_terminal                          # caption(optional) z17- (also has icon z17-)
+# amenity-recycling                                 # caption(optional) z18- (also has icon z17-)
 # amenity-vending_machine-fuel                      # caption(optional) z18- (also has icon z18-)
 # amenity-vending_machine-parking_tickets           # caption(optional) z17- (also has icon z17-)
 # amenity-vending_machine-public_transport_tickets  # caption(optional) z17- (also has icon z17-)

data/styles/default/light/symbols/tram-m.svg

@@ -1 +1 @@
-<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><rect fill="#fff" height="18" opacity=".6" rx="1.875" width="18"/><rect fill="#2f6499" height="16.5" rx="1.5" width="16.5" x=".75" y=".75"/><path d="m6.41350421 14.75c-.95 0-1.674375-.676875-1.7444375-1.6019375l-.0055625-.1480625v-.0833333l.25-6.1666667c0-.91666667.75-1.66666667 1.66666667-1.58333333h1.58333333v-.75c-.5 0-.91666667.16666666-1.08333333.16666666-.41666667.08333334-.83333334-.16666666-.91666667-.58333333s.08333333-.83333333.41666667-1l.11922451-.02060859c.27673179-.05556686.98917837-.2057297 1.91374923-.22689803l.38536266-.00204645-.00000307.26264718.00249272-.26264718.1683364-.00044693c1.24999997 0 2.16666667.25 2.24999997.25.3333334.16666667.5.58333333.4166667 1s-.5.66666667-.9166667.58333333c-.1666666 0-.5833333-.16666666-1.0833333-.16666666v.75h1.5833333c.8708334-.07916667 1.59125.59374999 1.6611146 1.44716666l.2555521 6.30283337v.0833333l-.0055625.1480625c-.0700625.9250625-.7944375 1.6019375-1.7444375 1.6019375zm.08333333-2.6666667c-.41666666 0-.75.3333334-.75.75 0 .4166667.33333334.75.75.75.41666667 0 .75-.4166666.75-.8333333s-.33333333-.6666667-.75-.6666667zm5.00582916 0c-.4166667 0-.75.25-.75.6666667s.3333333.8333333.75.8333333c.4166666 0 .75-.3333333.75-.75 0-.4166666-.3333334-.75-.75-.75zm-4.58916249-5.66666663c-.46428571 0-.85671769.3592687-.9104106.87764213l-.00625607.12235787-.08333333 2.41666666c0 .58333337.41666667.99999997.91666667.99999997h4.33916242c.5 0 .9166667-.4166666.9166667-.99999997l-.0833333-2.41666666-.0062561-.12235787c-.0536929-.51837343-.4461249-.87764213-.9104106-.87764213z" fill="#fff"/></g></svg>
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><rect fill="#fff" height="18" opacity=".6" rx="1.875" width="18"/><rect fill="#2f6499" height="16.5" rx="1.5" width="16.5" x=".75" y=".75"/><path d="m12.9135042 6.75c-.0833333-1-.8333333-1.66666667-1.75-1.66666667h-1.49999999v-.75c.33333333 0 .74999999.08333334 1.16666669.16666667.3333333.08333333.6666667-.16666667.8333333-.58333333.0833334-.41666667-.1666666-.75-.5833333-.91666667-.75-.16666667-1.50000002-.25-2.16666669-.25h-.08333333c-1.25 0-2.16666667.25-2.25.25-.33333334.16666667-.5.58333333-.41666667 1s.5.66666667.91666667.58333333c.16666666 0 .58333333-.16666666 1.08333333-.16666666v.75h-1.58333333c-.91666667-.08333334-1.66666667.66666666-1.66666667 1.58333333l-.25 6.1666667v.0833333c0 1 .75 1.75 1.75 1.75h5.16666669.0833333c1-.0833333 1.75-.9166667 1.6666667-1.8333333zm-6.99999999 3.08333333.08333333-2.41666666c0-.58333334.41666667-1 .91666667-1h3.99999999c.5 0 .8333334.41666666.9166667 1l.0833333 2.41666666c0 .58333337-.3333333.99999997-.8333333.99999997h-.0833333-4.16666672c-.5 0-.91666667-.4166666-.91666667-.99999997zm.58333333 3.74999997c-.41666666 0-.75-.3333333-.75-.75 0-.4166666.33333334-.75.75-.75.41666667 0 .75.25.75.6666667s-.33333333.8333333-.75.8333333zm4.83333336 0c-.4166667 0-.75-.3333333-.75-.75 0-.4166666.3333333-.75.75-.75s.75.3333334.75.75c0 .3333334-.3333333.75-.75.75z" fill="#fff"/></g></svg>

data/styles/default/light/symbols/tram-s.svg

@@ -1 +1 @@
-<svg height="12" viewBox="0 0 12 12" width="12" xmlns="http://www.w3.org/2000/svg"><g fill="none"><rect fill="#fff" height="12" opacity=".6" rx="1.875" width="12"/><rect fill="#2f6499" height="11.00025" rx="1.5" width="11.00025" x=".500003" y=".500003"/><path d="m5.99901368 2.00028841.27959242.00206521c.38744508.01070897.71530435.05601616.94321322.09555697l.34033345.06354774c.21527778.10763889.32291667.37673612.26909723.64583333-.04783951.23919754-.26577504.39334706-.50261012.38685034l-.14510611-.01607672-.26690051-.05931123c-.11014942-.02259475-.23865707-.04236516-.37704993-.04236516v.484375h1.02256944c.5525463-.05023148 1.01132716.3683642 1.07004218.90572943l.16780505 4.09947891v.05381944l-.00636265.12691821c-.05893828.58134568-.52106791 1.00329012-1.12384568 1.00329012h-3.34023687c-.60277777 0-1.0649074-.42194444-1.12384568-1.00329012l-.00636265-.12691821v-.05381944l.16145834-3.98263889c0-.59201389.484375-1.07638889 1.07638889-1.02256945h1.02256944v-.484375c-.27678572 0-.51403061.07908163-.64395044.10167639l-.05570234.0059625c-.26909722.05381945-.53819444-.10763889-.59201389-.37673612-.05381944-.26909721.05381945-.53819444.26909723-.64583333l.34033345-.06354774.25973069-.03996795c.19337167-.02593341.42518581-.04844971.68348253-.05558902zm-1.61563943 6.02748937c-.26909722 0-.484375.21527778-.484375.484375s.21527778.484375.484375.484375.484375-.26909722.484375-.53819445c0-.26909721-.21527778-.43055555-.484375-.43055555zm3.23259797 0c-.26909722 0-.484375.16145834-.484375.43055555 0 .26909723.21527778.53819445.484375.53819445s.484375-.21527778.484375-.484375-.21527778-.484375-.484375-.484375zm-.26909722-3.65972222h-2.69440353c-.29356061 0-.54264233.2223944-.58550379.54587716l-.00651009.09995617-.05381946 1.56076389c0 .37673611.26909723.64583334.59201389.64583334h2.80204243c.32291666 0 .59201389-.26909723.59201389-.64583334l-.05381946-1.56076389-.00651009-.09995617c-.04286146-.32348276-.29194318-.54587716-.58550379-.54587716z" fill="#fff"/></g></svg>
+<svg height="12" viewBox="0 0 12 12" width="12" xmlns="http://www.w3.org/2000/svg"><g fill="none"><rect fill="#fff" height="12" opacity=".6" rx="1.875" width="12"/><rect fill="#2f6499" height="11.00025" rx="1.5" width="11.00025" x=".500003" y=".500003"/><path d="m8.52747147 4.58333334c-.05381944-.64583334-.53819445-1.07638889-1.13020833-1.07638889h-.96875v-.48437501c.21527777 0 .484375.05381945.75347222.10763889.21527778.05381945.43055555-.10763889.53819445-.37673611.05381944-.26909722-.1076389-.484375-.37673612-.59201389-.484375-.10763889-.96874999-.16145833-1.39930555-.16145833h-.05381945c-.80729166 0-1.39930555.16145833-1.45312499.16145833-.21527778.10763889-.32291667.37673612-.26909723.64583333.05381945.26909723.32291667.43055557.59201389.37673612.10763889 0 .37673611-.10763889.69965278-.10763889v.484375h-1.02256944c-.59201389-.05381944-1.07638889.43055556-1.07638889 1.02256945l-.16145834 3.98263889v.05381944c0 .64583333.484375 1.13020833 1.13020833 1.13020833h3.33680556.05381945c.64583333-.05381944 1.13020833-.59201389 1.07638889-1.18402777zm-4.52083334 1.99131944.05381946-1.56076389c0-.37673611.26909721-.64583333.59201388-.64583333h2.58333333c.32291667 0 .53819445.26909722.5920139.64583333l.05381944 1.56076389c0 .37673611-.21527778.64583334-.53819445.64583334h-.05381944-2.69097223c-.32291666 0-.59201389-.26909723-.59201389-.64583334zm.37673612 2.421875c-.26909722 0-.484375-.21527778-.484375-.48437499 0-.26909723.21527778-.48437501.484375-.48437501s.484375.16145834.484375.43055555c0 .26909723-.21527778.53819445-.484375.53819445zm3.12152778 0c-.26909723 0-.484375-.21527778-.484375-.48437499 0-.26909723.21527777-.48437501.484375-.48437501.26909722 0 .48437499.21527778.48437499.48437501 0 .21527777-.21527777.48437499-.48437499.48437499z" fill="#fff"/></g></svg>

data/styles/outdoors/include/priorities_4_overlays.prio.txt

@@ -1144,6 +1144,7 @@ leisure-sports_hall                                 # icon z17- (also has captio
 amenity-compressed_air                              # icon z18- (also has caption(optional) z19-)
 amenity-parcel_locker                               # icon z17- (also has caption(optional) z17-)
 amenity-payment_terminal                            # icon z17- (also has caption(optional) z17-)
+amenity-recycling                                   # icon z17- (also has caption(optional) z18-)
 amenity-vending_machine-fuel                        # icon z18- (also has caption(optional) z18-)
 amenity-vending_machine-parking_tickets             # icon z17- (also has caption(optional) z17-)
 amenity-vending_machine-public_transport_tickets    # icon z17- (also has caption(optional) z17-)
@@ -2220,6 +2221,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # amenity-compressed_air                            # caption(optional) z19- (also has icon z18-)
 # amenity-parcel_locker                             # caption(optional) z17- (also has icon z17-)
 # amenity-payment_terminal                          # caption(optional) z17- (also has icon z17-)
+# amenity-recycling                                 # caption(optional) z18- (also has icon z17-)
 # amenity-vending_machine-fuel                      # caption(optional) z18- (also has icon z18-)
 # amenity-vending_machine-parking_tickets           # caption(optional) z17- (also has icon z17-)
 # amenity-vending_machine-public_transport_tickets  # caption(optional) z17- (also has icon z17-)

data/subtypes.csv

@@ -1,10 +1,3 @@
 Types;Related Subtypes
 amenity|charging_station;amenity|charging_station|motorcar,amenity|charging_station|motorcycle,amenity|charging_station|bicycle,amenity|charging_station|small,amenity|charging_station|carless
-amenity|bench;amenity|bench|backless
-buoy|lateral|port,spherical_buoy|lateral|port,beacon|lateral|port;lateral|port
-buoy|lateral|starboard,spherical_buoy|lateral|starboard,beacon|lateral|starboard;lateral|starboard
-buoy|cardinal|east,spherical_buoy|cardinal|east,beacon|cardinal|east;cardinal|east
-buoy|cardinal|west,spherical_buoy|cardinal|west,beacon|cardinal|west;cardinal|west
-buoy|cardinal|south,spherical_buoy|cardinal|south,beacon|cardinal|south;cardinal|south
-buoy|cardinal|north,spherical_buoy|cardinal|north,beacon|cardinal|north;cardinal|north
-amenity|recycling|centre,amenity|recycling|container;recycling|clothes,recycling|shoes,recycling|small_appliances,recycling|batteries,recycling|scrap_metal,recycling|green_waste,recycling|glass_bottles,recycling|plastic_bottles,recycling|cans,recycling|cartons,recycling|cardboard,recycling|paper,recycling|plastic
+amenity|bench;amenity|bench|backless

docs/ECLIPSE.md

@@ -1,150 +0,0 @@
-# Eclipse
-
-As mentioned in [Building](INSTALL.md), there are several IDEs which can be used for CoMaps development. With the refactoring of the code that happened in August 2025, Eclipse finally can be used to work with the CoMaps C++ and Java codebase. (Code in other languages is untested.)
-
-Eclipse natively supports Java, thus it can be used to edit the entire Android codebase. However, although Eclipse was once the tool for Android development, the Android plug-ins (ADT and its fork, Andmore) are no longer being actively developed. Therefore, although you can edit Java code for Android in Eclipse, you will get warnings about missing Android-specific dependencies. Building and debugging the Android app is not possible (or will require a lot of tinkering to get it to work).
-
-## Prerequisites
-
-You need Eclipse with CDT (C/C++ developer tools).
-
-## Import the code
-
-**Do not** import the entire source directory – the code indexer will choke on `3party`. Instead, import the following directories as individual projects:
-
-* `libs` – this should be the first dir to import
-* `qt` if you want to work on the desktop app
-* `tools` if you want to work on tools which are not part of the main app
-
-If you want to work on the Android app from within Eclipse, you can also import `android`. We don’t have instructions for that yet (feel free to contribute yours) but have been able to import that portion of the code into Eclipse. There are three main caveats:
-
-* You need to import C++ and Java code separately
-* In Java, Eclipse may not be able to find Android-specific dependencies which are not part of the standard Java API
-* The code has been refactored since this was last tried successfully; Android code has been split into an app and an SDK portion; you may need to import each of these separately
-
-## Import code dirs
-
-Repeat these steps for each subdir you want to work with (`libs`, `qt`, `android`, tools` etc.).
-
-From the menu, choose **File > Import**.
-
-In the dialog that opens, select **C/C++ > Existing Code as Makefile Project** and click **Next**.
-
-In the next dialog:
-
-* Set the **Project Name** (we recommend using the name of the subdir)
-* Set the path for the **Existing Code Location** (a subdir of the CoMaps code dir, such as `libs`, `qt` or `tools`)
-* Ensure both C and C++ are selected under **Languages**
-* Under **Toolchain for Indexer Settings**, select **CMake driven**.
-* Click **Finish**.
-
-After you have imported the code and open the first source files, Eclipse will flag lots of errors in the code, as it cannot find any of the included header files outside the project. We will rectify that in the next steps.
-
-## Header files in project root
-
-Some header files are located in the root dir of the source tree. You to import them into a location where Eclipse can find them.
-
-Right-click the `libs` project and choose **Import** from the context menu.
-
-In the dialog that opens, select **General > File System** and click **Next**.
-
-In the **File System** dialog:
-
-* In **From Directory**, enter (or browse to) the root dir of the CoMaps sources.
-* In the list of files below, check all header files (at the time of this writing, `defines.hpp`, `omim_config.h`, `precompiled_headers.hpp` and `private.h`).
-* Under **Options**, click **Advanced**.
-* Check **Create links in workspace**.
-* Click **Finish**.
-
-The header files will now appear at the root of `libs`. These are links that point to the files in their original location.
-
-Should any additional header files ever get added to the root dir, you will have to repeat this step.
-
-## Dependencies
-
-Right-click the project root in Package Explorer and select **Properties** from the context menu.
-
-In the dialog that opens, select **C/C++ General > Paths and Symbols** from the tree on the left.
-
-Click the **Includes** tab and add the following paths:
-
-* The standard include paths of your system (these can be obtained by running `echo | g++ -v -x c++ -E -` and looking for the line which reads `#include <...> search starts here:`)
-* The following subdirs of `3party` (in the CoMaps source dir):
-  * `boost`
-  * `pugixml/pugixml/src`
-  * For other dependencies, figure out where the header files are and how they are included – for example, if one of the source files includes `<foo/foo_base.hpp>` and you find the file in `3party/libfoo/headers/foo/foo_base.hpp`, include `3party/libfo/headers`
-* Qt6 headers – on Ubuntu 24.04, they are found in `/usr/include/x86_64-linux-gnu/qt6`. (Only for needed for `qt`; also for `tools` if you’re working on GUI tools.) You will also need at least the following subdirs:
-  * `QtCore`
-  * `QtGui`
-  * `QtOpenGL`
-  * `QtOpenGLWidgets`
-  * `QtWidgets`
-* This list may be incomplete – if you spot anything missing and know how to add it, please add it here
-
-On the **References** tab, check `libs` (except in the `libs` project itself, where this is not available and not needed).
-
-## Building
-
-> [!NOTE]
-> So far, we haven’t found a way to configure our toolchain as a builder in Eclipse (which would allow us to have Eclipse build the artifact as needed before running it)  – if you know how to do this, your input is appreciated. Until then, the workaround is to configure the build command as an external tool. The build command must then be launched manually after making changes to the code. After that you can launch the build artifact using Run.
-
-Build and run configurations are relative to a project. Since the code is spread across multiple projects, the recommendation is to configure the build for the project where the frontend resides – `qt` for the desktop app, `tools` for any tools.
-
-### Configure the build command as an external command
-
-From the menu, choose **Run > External Tools > External Tools Configurations...***
-
-Right-click **Program** in the left pane and select **New configuration**. (One blank configuration may already have been created, which you can adapt to your needs.)
-
-* Set a name for the external command (e.g. `Build`, followed by the artifact name and release or debug)
-* On the **Main** tab:
-  * **Location**: `${workspace_loc:/tools/unix/build_omim.sh}`
-  * **Working Directory**: `${workspace_loc:/qt}/..` or `${workspace_loc:/tools}/..`
-  * **Arguments**: arguments to the build script (e.g. `-r desktop` for a desktop release build)
-* On the **Refresh** tab, uncheck **Refresh resources upon completion**.
-* On the **Build** tab, uncheck **Build before launch**.
-
-### Configure a builder
-
-> [!WARNING]
-> **This currently does not work, see above.**
-> * The prebuilt binary gets launched but no build happens, not even after changes.
-> * When explicitly starting a build, it fails with an error.
-> * Changes to the build config do not seem to take effect.
-> The steps here are for reference only; any input on getting this to work is welcome.
-
-Right-click the project root in Package Explorer and select **Properties** from the context menu.
-
-In the dialog that opens, select **C/C++ Build** from the tree on the left.
-
-* Click **Manage Configurations** and create a new build configuration.
-* Make sure the new configuration is selected in the **Configuration** drop-down list.
-* On the **Builder Settings** tab:
-  * Uncheck **Use default build command** and set the build command to `./tools/unix/build_omim.sh`.
-  * Set the build directory to `${workspace_loc:/qt}/..` or `${workspace_loc:/tools}/..`.
-* On the **Behavior** tab:
-  * Select **Use custom build arguments** and supply the arguments to the build script (e.g. `-r desktop` for a desktop release build).
-  * Uncheck **Build (Incremental build)** and **Clean**
-  
-### Create a run configuration
-
-To run the artifact, choose **Run > Run Configurations...** from the menu. In the dialog that opens, right-click **C/C++ Application** in the pane on the left and choose **New Configuration**. Make the following settings:
-* In the **Main** tab:
-  * **Project**: one of the projects in the workspace, see recommendation above
-  * **C/C++ Application**: path where the build artifact (the finished binary) resides
-  * **Build Configuration**: choose the appropriate build configuration (see above)
-* In the **Arguments** tab, you can choose the working directory from which to launch the binary, and specify command line arguments.
-* In the **Environment** tab, you can set environment variables if you need this for your artifact.
-
-### Building with CMake
-
-The recommended toolchain is `build_omim.sh`. If nonetheless you need to build with CMake for some reason:
-* Specify `cmake` (with full path, as returned by `which cmake`) as the build command in the build configuration
-* Use the same build directory as you would for `build_omim.sh`, i.e. `${workspace_loc:/qt}/..` or `${workspace_loc:/tools}/..`.
-* Specify the build arguments for CMake. This would also include the `--build` dir. You will also need `--target` to specify the build target.
-
-### Building for Android
-
-Although we have not tested it yet, triggering an Android build from within Eclipse should be possible in the same way if you specify the `gradlew` script as the build tool. This should be pretty straightforward with the external tool workaround described above.
-
-Installing, launching and debugging the Android app from Eclipse might be more difficult or not even possible, as there is no longer an actively maintained toolchain for Android development with Eclipse.

docs/STRUCTURE.md

@@ -31,7 +31,6 @@ There are some other files not mentioned here.
 ### Map features / classificator
 
 - `mapcss-mapping.csv` - mapping between OSM tags and CoMaps types.
-- `subtypes.csv` - declaring CoMaps types as having subtypes or being one.
 - `replaced_tags.txt` - merging similar OSM tags.
 - `mixed_tags.txt` - pedestrian streets of high popularity.
 

docs/STYLES.md

@@ -67,13 +67,13 @@ preferably look for icons in [collections CoMaps uses already](../data/copyright
 2. If necessary merge similar tags in via `data/replaced_tags.txt`
 3. Define a priority for the new feature type in e.g. [`priorities_4_overlays.prio.txt`](../data/styles/default/include/priorities_4_overlays.prio.txt) and/or other priorities files
 4. Add a new icon (see [above](#how-to-add-a-new-icon)) and/or other styling (area, line..)
-5. If a new POI is a subtype or has subtypes, add it accordingly to `data/subtypes.csv`
-6. If a new POI should be OSM-addable/editable then add it to `data/editor.config`
-7. Add the English string (and optionally translations e.g. for your native language) into iOS (`iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings`) and Android (`android/sdk/src/main/res/values/types_strings.xml`) type strings
-8. Add search keywords into `data/categories-strings/en.json/localize.json`
-9. Add new or fix current classifier tests at `generator/generator_tests/osm_type_tests.cpp` if you can
-10. [Test](#testing-your-changes) your changes
-11. Relax and wait for the next maps update :)
+5. If a new POI should be OSM-addable/editable then add it to `data/editor.config`
+6. Add the English string (and optionally translations e.g. for your native language) into iOS and Android type strings
+e strings
+7. Add search keywords into `data/categories.txt`
+8. Add new or fix current classifier tests at `generator/generator_tests/osm_type_tests.cpp` if you can
+9. [Test](#testing-your-changes) your changes
+10. Relax and wait for the next maps update :)
 
 ## Testing your changes
 

generator/osm2meta.cpp

@@ -104,7 +104,8 @@ std::string MetadataTagProcessorImpl::ValidateAndFormat_operator(std::string con
 {
   using namespace ftypes;
   auto const & t = m_params.m_types;
-  if (IsATMChecker::Instance()(t) || IsRecyclingChecker::Instance()(t) || IsPostPoiChecker::Instance()(t) ||
+  if (IsATMChecker::Instance()(t) || IsRecyclingCentreChecker::Instance()(t) ||
+      IsRecyclingContainerChecker::Instance()(t) || IsPostPoiChecker::Instance()(t) ||
       IsOperatorOthersPoiChecker::Instance()(t))
   {
     return v;

generator/osm2type.cpp

@@ -270,10 +270,6 @@ public:
     ShuttleTrain,
     DisusedBusiness,
     Building,
-    ChargingStation,
-    SmallChargingStation,
-    MotorcarChargingStation,
-    CarlessChargingStation,
     Count
   };
 
@@ -315,10 +311,6 @@ public:
         {ShuttleTrain, {"route", "shuttle_train"}},
         {DisusedBusiness, {"disusedbusiness"}},
         {Building, {"building"}},
-        {ChargingStation, {"amenity", "charging_station"}},
-        {SmallChargingStation, {"amenity", "charging_station", "small"}},
-        {MotorcarChargingStation, {"amenity", "charging_station", "motorcar"}},
-        {CarlessChargingStation, {"amenity", "charging_station", "carless"}},
     };
 
     m_types.resize(static_cast<size_t>(Count));
@@ -1346,25 +1338,6 @@ void PostprocessElement(OsmElement * p, FeatureBuilderParams & params)
       railwayDone = true;
     }
   }
-
-  // This is needed in the generator to work around charing stations, which are only implicitly marked as for cars
-  if (params.IsTypeExist(types.Get(CachedTypes::ChargingStation)))
-  {
-    uint32_t const motorcarChargingStation = types.Get(CachedTypes::MotorcarChargingStation);
-    uint32_t const carlessChargingStation = types.Get(CachedTypes::CarlessChargingStation);
-
-    if (!params.IsTypeExist(motorcarChargingStation) && !params.IsTypeExist(carlessChargingStation))
-      params.AddType(motorcarChargingStation);
-
-    if (params.IsTypeExist(carlessChargingStation))
-    {
-      params.PopExactType(carlessChargingStation);
-
-      uint32_t const smallChargingStation = types.Get(CachedTypes::SmallChargingStation);
-      if (params.IsTypeExist(smallChargingStation))
-        params.PopExactType(smallChargingStation);
-    }
-  }
 }
 }  // namespace
 

iphone/Maps/LocalizedStrings/af.lproj/LocalizableTypes.strings

@@ -129,6 +129,7 @@
 "type.amenity.pub" = "Kroeg";
 "type.amenity.public_bookcase" = "Boekekas";
 "type.amenity.recycling.centre" = "Herwinningsentrum";
+"type.amenity.recycling" = "Herwinningshouer";
 "type.amenity.recycling.container" = "Herwinningshouer";
 "type.recycling.batteries" = "Batterye";
 "type.recycling.clothes" = "Klere";