Update outdated tags of amenity/office/shop browse icons

diff --git a/app/assets/images/browse/education_nursery.p.16.png b/app/assets/images/browse/amenity_childcare.p.16.png
similarity index 100%
rename from app/assets/images/browse/education_nursery.p.16.png
rename to app/assets/images/browse/amenity_childcare.p.16.png

diff --git a/app/assets/images/browse/amenity_embassy.16.png b/app/assets/images/browse/office_diplomatic.16.png
similarity index 100%
rename from app/assets/images/browse/amenity_embassy.16.png
rename to app/assets/images/browse/office_diplomatic.16.png

diff --git a/app/assets/images/browse/shop_estateagent2.p.16.png b/app/assets/images/browse/shop_estateagent.16.png
similarity index 100%
rename from app/assets/images/browse/shop_estateagent2.p.16.png
rename to app/assets/images/browse/shop_estateagent.16.png

diff --git a/app/assets/images/browse/shop_jewellery.16.png b/app/assets/images/browse/shop_jewelry.16.png
similarity index 100%
rename from app/assets/images/browse/shop_jewellery.16.png
rename to app/assets/images/browse/shop_jewelry.16.png

diff --git a/app/assets/images/browse/shop_fish.p.16.png b/app/assets/images/browse/shop_seafood.16.png
similarity index 100%
rename from app/assets/images/browse/shop_fish.p.16.png
rename to app/assets/images/browse/shop_seafood.16.png

diff --git a/app/assets/stylesheets/browse.scss b/app/assets/stylesheets/browse.scss
index 5aa6a499c0e23154bc157f701d077d20a2a4e194..2dac602fed327e5bbfa2b178f1839f352098633a 100644 (file)
--- a/app/assets/stylesheets/browse.scss
+++ b/app/assets/stylesheets/browse.scss
@@ -15,18 +15,18 @@ $map-sidebar-icons: (
   ".amenity.cafe": ("filename": "amenity_cafe.16.png", "invert": true),
   ".amenity.car_rental": ("filename": "transport_rental_car.16.png"),
   ".amenity.car_sharing": ("filename": "car_share.p.16.png"),
   ".amenity.cafe": ("filename": "amenity_cafe.16.png", "invert": true),
   ".amenity.car_rental": ("filename": "transport_rental_car.16.png"),
   ".amenity.car_sharing": ("filename": "car_share.p.16.png"),

+  ".amenity.childcare": ("filename": "amenity_childcare.p.16.png"),

   ".amenity.cinema": ("filename": "amenity_cinema.16.png", "invert": true),
   ".amenity.courthouse": ("filename": "amenity_courthouse.16.png", "invert": true),
   ".amenity.dentist": ("filename": "amenity_dentist.16.png"),
   ".amenity.doctors": ("filename": "amenity_doctors.16.png"),
   ".amenity.drinking_water": ("filename": "amenity_drinking_water.16.png", "invert": true),
   ".amenity.cinema": ("filename": "amenity_cinema.16.png", "invert": true),
   ".amenity.courthouse": ("filename": "amenity_courthouse.16.png", "invert": true),
   ".amenity.dentist": ("filename": "amenity_dentist.16.png"),
   ".amenity.doctors": ("filename": "amenity_doctors.16.png"),
   ".amenity.drinking_water": ("filename": "amenity_drinking_water.16.png", "invert": true),

-  ".amenity.embassy": ("filename": "amenity_embassy.16.png"),

   ".amenity.fast_food": ("filename": "amenity_fast_food.16.png", "invert": true),
   ".amenity.fire_station": ("filename": "amenity_fire_station.16.png", "invert": true),
   ".amenity.fuel": ("filename": "amenity_fuel.16.png"),
   ".amenity.hospital": ("filename": "amenity_hospital.16.png"),
   ".amenity.fast_food": ("filename": "amenity_fast_food.16.png", "invert": true),
   ".amenity.fire_station": ("filename": "amenity_fire_station.16.png", "invert": true),
   ".amenity.fuel": ("filename": "amenity_fuel.16.png"),
   ".amenity.hospital": ("filename": "amenity_hospital.16.png"),

+  ".amenity.kindergarten": ("filename": "amenity_childcare.p.16.png"),

   ".amenity.library": ("filename": "library.p.16.png", "invert": true),
   ".amenity.library": ("filename": "library.p.16.png", "invert": true),

-  ".amenity.nursery": ("filename": "education_nursery.p.16.png"),

   ".amenity.nightclub": ("filename": "amenity_nightclub.16.png", "invert": true),
   ".amenity.parking": ("filename": "parking.p.16.png"),
   ".amenity.pharmacy": ("filename": "amenity_pharmacy.16.png"),
   ".amenity.nightclub": ("filename": "amenity_nightclub.16.png", "invert": true),
   ".amenity.parking": ("filename": "parking.p.16.png"),
   ".amenity.pharmacy": ("filename": "amenity_pharmacy.16.png"),


@@ -69,6 +69,9 @@ $map-sidebar-icons: (
 
   ".natural.tree": ("filename": "tree.p.16.png"),
 
 
   ".natural.tree": ("filename": "tree.p.16.png"),
 

+  ".office.diplomatic": ("filename": "office_diplomatic.16.png"),
+  ".office.estate_agent": ("filename": "shop_estateagent.16.png"),
+

   ".railway.halt": ("filename": "halt.p.16.png"),
   ".railway.station": ("filename": "station.p.16.png"),
   ".railway.level_crossing": ("filename": "level_crossing.p.16.png", "invert": true),
   ".railway.halt": ("filename": "halt.p.16.png"),
   ".railway.station": ("filename": "station.p.16.png"),
   ".railway.level_crossing": ("filename": "level_crossing.p.16.png", "invert": true),


@@ -83,11 +86,10 @@ $map-sidebar-icons: (
   ".shop.car_parts": ("filename": "shop_car_parts.16.png"),
   ".shop.car_repair": ("filename": "shop_car_repair.16.png"),
   ".shop.convenience": ("filename": "shop_convenience.p.16.png"),
   ".shop.car_parts": ("filename": "shop_car_parts.16.png"),
   ".shop.car_repair": ("filename": "shop_car_repair.16.png"),
   ".shop.convenience": ("filename": "shop_convenience.p.16.png"),

-  ".shop.diy": ("filename": "shop_doityourself.16.png"),
+  ".shop.doityourself": ("filename": "shop_doityourself.16.png"),

   ".shop.electronics": ("filename": "shop_electronics.16.png"),
   ".shop.electronics": ("filename": "shop_electronics.16.png"),

-  ".shop.estate_agent": ("filename": "shop_estateagent2.p.16.png"),
+  ".shop.estate_agent": ("filename": "shop_estateagent.16.png"),

   ".shop.fashion": ("filename": "shop_clothes.16.png"),
   ".shop.fashion": ("filename": "shop_clothes.16.png"),

-  ".shop.fish": ("filename": "shop_fish.p.16.png"),

   ".shop.florist": ("filename": "shop_florist.16.png"),
   ".shop.furniture": ("filename": "shop_furniture.16.png"),
   ".shop.garden_centre": ("filename": "shop_florist.16.png"),
   ".shop.florist": ("filename": "shop_florist.16.png"),
   ".shop.furniture": ("filename": "shop_furniture.16.png"),
   ".shop.garden_centre": ("filename": "shop_florist.16.png"),


@@ -95,11 +97,11 @@ $map-sidebar-icons: (
   ".shop.greengrocer": ("filename": "shop_greengrocer.p.16.png"),
   ".shop.hardware": ("filename": "shop_doityourself.16.png"),
   ".shop.hairdresser": ("filename": "shop_hairdresser.16.png"),
   ".shop.greengrocer": ("filename": "shop_greengrocer.p.16.png"),
   ".shop.hardware": ("filename": "shop_doityourself.16.png"),
   ".shop.hairdresser": ("filename": "shop_hairdresser.16.png"),

-  ".shop.jewelry": ("filename": "shop_jewellery.16.png"),
-  ".shop.jewellery": ("filename": "shop_jewellery.16.png"),
+  ".shop.jewelry": ("filename": "shop_jewelry.16.png"),

   ".shop.mobile_phone": ("filename": "shop_mobile_phone.16.png"),
   ".shop.optician": ("filename": "shop_optician.16.png"),
   ".shop.pet": ("filename": "shop_pet.16.png"),
   ".shop.mobile_phone": ("filename": "shop_mobile_phone.16.png"),
   ".shop.optician": ("filename": "shop_optician.16.png"),
   ".shop.pet": ("filename": "shop_pet.16.png"),

+  ".shop.seafood": ("filename": "shop_seafood.16.png"),

   ".shop.shoes": ("filename": "shop_shoes.16.png"),
   ".shop.supermarket": ("filename": "shop_supermarket.p.16.png"),
 
   ".shop.shoes": ("filename": "shop_shoes.16.png"),
   ".shop.supermarket": ("filename": "shop_supermarket.p.16.png"),
 

diff --git a/app/helpers/browse_helper.rb b/app/helpers/browse_helper.rb
index d3e8f10f900174119adf34a9b023774fe734c4dc..c8fc8245c5e29e61bd5363c0bbde3aff7b31e3b0 100644 (file)
--- a/app/helpers/browse_helper.rb
+++ b/app/helpers/browse_helper.rb
@@ -107,7 +107,7 @@ module BrowseHelper
 
   private
 
 
   private
 

-  ICON_TAGS = %w[aeroway amenity barrier building highway historic landuse leisure man_made natural railway shop tourism waterway].freeze
+  ICON_TAGS = %w[aeroway amenity barrier building highway historic landuse leisure man_made natural office railway shop tourism waterway].freeze

 
   def icon_tags(object)
     object.tags.find_all { |k, _v| ICON_TAGS.include? k }.sort
 
   def icon_tags(object)
     object.tags.find_all { |k, _v| ICON_TAGS.include? k }.sort