Regression: shop=department_store has lost its icon

[daganzdaanda]

After #604, department_stores do not show the special icon anymore, but the generic dot instead.

there are two places where department_store is found in the code:

openstreetmap-carto/amenity-points.mss

Line 343 in 6c3b0d9

[shop = 'department_store'][zoom >= 16]::shop {

has
point-file: url('symbols/department_store.p.16.png');

and

openstreetmap-carto/project.mml

Line 1301 in 6b2747f

"table": "(select way,amenity,shop,tourism,highway,man_made,access,religion,waterway,lock,historic,leisure\n from planet_osm_point\n where shop in ('accessories', 'alcohol', 'antique', 'antiques', 'appliance', 'art', 'baby_goods', 'bag', 'bags', 'bakery', 'bathroom_furnishing', 'beauty', 'bed', 'betting', 'beverages', 'bicycle', 'boat', 'bookmaker', 'books', 'boutique', 'builder', 'building_materials', 'butcher', 'camera', 'car', 'car_parts', 'car_repair', 'car_service', 'carpet', 'charity', 'cheese', 'chemist', 'chocolate', 'clothes', 'coffee', 'communication', 'computer', 'confectionery', 'convenience', 'copyshop', 'cosmetics', 'craft', 'curtain', 'dairy', 'deli', 'delicatessen', 'department_store', 'discount', 'dive', 'doityourself', 'dry_cleaning', 'e-cigarette', 'electrical', 'electronics', 'energy', 'erotic', 'estate_agent', 'fabric', 'farm', 'fashion', 'fish', 'fishing', 'fishmonger', 'flooring', 'florist', 'food', 'frame', 'frozen_food', 'funeral_directors', 'furnace', 'furniture', 'gallery', 'gambling', 'games', 'garden_centre', 'gas', 'general', 'gift', 'glaziery', 'greengrocer', 'grocery', 'hairdresser', 'hardware', 'health', 'health_food', 'hearing_aids', 'herbalist', 'hifi', 'hobby', 'household', 'houseware', 'hunting', 'ice_cream', 'insurance', 'interior_decoration', 'jewellery', 'jewelry', 'kiosk', 'kitchen', 'laundry', 'leather', 'lighting', 'locksmith', 'lottery', 'mall', 'market', 'massage', 'medical', 'medical_supply', 'mobile_phone', 'money_lender', 'motorcycle', 'motorcycle_repair', 'music', 'musical_instrument', 'newsagent', 'office_supplies', 'optician', 'organic', 'outdoor', 'paint', 'pastry', 'pawnbroker', 'perfumery', 'pet', 'pets', 'pharmacy', 'phone', 'photo', 'photo_studio', 'photography', 'pottery', 'printing', 'radiotechnics', 'real_estate', 'religion', 'rental', 'salon', 'scuba_diving', 'seafood', 'second_hand', 'sewing', 'shoe_repair', 'shoes', 'shopping_centre', 'solarium', 'souvenir', 'sports', 'stationery', 'supermarket', 'tailor', 'tanning', 'tattoo', 'tea', 'ticket', 'tiles', 'tobacco', 'toys', 'trade', 'travel_agency', 'tyres', 'vacuum_cleaner', 'variety_store', 'video', 'video_games', 'watches', 'wholesale', 'wine', 'winery', 'yes')\n or amenity is not null\n or tourism in ('alpine_hut','picnic_site','camp_site','caravan_site','guest_house','hostel','hotel','motel','museum','viewpoint','bed_and_breakfast','information','chalet')\n or highway in ('bus_stop','traffic_signals','ford')\n or man_made in ('mast','water_tower')\n or historic in ('memorial','archaeological_site')\n or waterway='lock'\n or lock='yes'\n or leisure in ('playground','slipway','picnic_table')\n ) as amenity_points",

[matthijsmelissen]

I think point-file and point-placement should be marker-file and marker-placement, otherwise the generic dot is rendered.

[pnorman]

I think point-file and point-placement should be marker-file and marker-placement, otherwise the generic dot is rendered.

This might be a SVG vs PNG issue. point-* does not allow you to transform the colour, something we need and marker-* does allow.

[pnorman]

Are there any issues with converting all the PNG-based icons to use to marker-* in the MSS?

[matthijsmelissen]

It seems markers do not support PNG: mapnik/mapnik#952

[pnorman]

I guess we need to then unset point-* for SVG markers, at least until we convert everything to SVG.

I was actually thinking about converting the dot to SVG, or using a • as text.

[daganzdaanda]

Is the icon still active on z16?
Here http://www.openstreetmap.org/?mlat=48.0456&mlon=10.4881#map=16/48.0456/10.4881 are two department_store icons, they turn into dots when zoomed in. I changed the position of one of them just a little bit, and made the tile dirty, to see if they disappear when re-rendered - but they are still there.
ETA: Another one: http://www.openstreetmap.org/node/549090361