fix readme, translation & filters order

README.md

@@ -35,9 +35,11 @@ The table below describes the tags that the app currently supports.
 | Clothes         | recycling:clothes         |      |
 | Hazardous waste | recycling:hazardous_waste |      |
 | Scrap metal     | recycling:scrap_metal     |      |
-| Engine oil      | recycling:engine_oil      |      |
 | Low energy bulbs| recycling:low_energy_bulbs|      |
 | Batteries       | recycling:batteries       |      |
+| Tyres           | recycling:tyres           |      |
+| Car batteries   | recycling:car_batteries   |      |
+| Engine oil      | recycling:engine_oil      |      |
 
 More information about tags you can get on [OSM Wiki](https://wiki.openstreetmap.org/wiki/Tag:amenity%3Drecycling).
 

src/components/NodesFilter.vue

@@ -1,5 +1,8 @@
 <template>
     <div class="map_filters">
+        <div :class="['map_filter ico_all', {filter_active: filter.recycling}]" @click="filter.invert('recycling')">
+            <span>{{ $t('fraction.anyRecycling') }}</span>
+        </div>
         <div :class="['map_filter ico_plastic', {filter_active: filter.plastic}]" @click="filter.invert('plastic')">
             <span>{{ $t('fraction.plastic') }}</span>
         </div>
@@ -45,15 +48,9 @@
         <div :class="['map_filter ico_engine_oil', {filter_active: filter.engine_oil}]" @click="filter.invert('engine_oil')">
             <span>{{ $t('fraction.engine_oil') }}</span>
         </div>
-
-        <div :class="['map_filter ico_all', {filter_active: filter.recycling}]" @click="filter.invert('recycling')">
-            <span>{{ $t('fraction.anyRecycling') }}</span>
-        </div>
-
         <div :class="['map_filter ico_waste_disposal', {filter_active: filter.waste_disposal}]" @click="filter.invert('waste_disposal')">
             <span>{{ $t('fraction.wasteDisposal') }}</span>
         </div>
-
     </div>
 </template>
 

src/locales/ru.json

@@ -32,11 +32,13 @@
     "batteries": "Батарейки",
     "plastic_bottles": "Пластиковые бутылки",
     "hazardous_waste": "Опасные отходы",
-    "engine_oil": "Машинное масло",
     "clothes": "Одежда",
     "low_energy_bulbs": "Лампочки",
     "plastic_bags": "Пакеты",
-    "scrap_metal": "Металлолом"
+    "scrap_metal": "Металлолом",
+    "tyres": "Шины",
+    "car_batteries": "Автомобильные аккумуляторы",
+    "engine_oil": "Машинное масло"
   },
   "menu": {
     "map": "Карта",