diff options
| author | Marcus Lundblad <ml@update.uu.se> | 2021-08-23 23:11:45 +0200 |
|---|---|---|
| committer | Marcus Lundblad <ml@update.uu.se> | 2021-08-25 21:55:45 +0200 |
| commit | 72f39d09b9d90d56deb964dcd2c1f34b0cc49fa8 (patch) | |
| tree | a1894b574f21ab7a2bedefabef1d71b09bec9061 | |
| parent | 47796cf917f499bb9b34ab2fd47719e3b33fd82b (diff) | |
| download | gnome-maps-wip/mlundblad/less-shoplike-shops.tar.gz | |
placeIcons: Refine use of shopping cart iconwip/mlundblad/less-shoplike-shops
Use the shopping cart icon for more supermarket-
like place types, as covering all shop= catches
some cases where it is not as fitting.
Better fall back to the generic pin icon
for other shop= tags.
| -rw-r--r-- | src/placeIcons.js | 6 | ||||
| -rw-r--r-- | tests/placeIconsTest.js | 5 |
2 files changed, 10 insertions, 1 deletions
diff --git a/src/placeIcons.js b/src/placeIcons.js index 9e171976..4ef1303f 100644 --- a/src/placeIcons.js +++ b/src/placeIcons.js @@ -99,7 +99,11 @@ const TYPE_ICON_MAP = { tram_stop: 'route-transit-tram-symbolic' }, shop: { - _: 'shopping-cart-symbolic' + convenience: 'shopping-cart-symbolic', + department_store: 'shopping-cart-symbolic', + general: 'shopping-cart-symbolic', + mall: 'shopping-cart-symbolic', + supermarket: 'shopping-cart-symbolic' }, tourism: { alpine_hut: 'bed-symbolic', diff --git a/tests/placeIconsTest.js b/tests/placeIconsTest.js index fb94bd53..076f1a94 100644 --- a/tests/placeIconsTest.js +++ b/tests/placeIconsTest.js @@ -50,10 +50,15 @@ function testKnownTypes() { let p1 = new MockedPlace({ osmKey: 'amenity', osmValue: 'restaurant' }); let p2 = new MockedPlace({ osmKey: 'place', osmValue: 'city' }); let p3 = new MockedPlace({ osmKey: 'amenity', osmValue: 'pub' }); + let p4 = new MockedPlace({ osmKey: 'shop', osmValue: 'supermarket' }); + let p5 = new MockedPlace({ osmKey: 'shop', osmValue: 'hairdresser' }); JsUnit.assertEquals('restaurant-symbolic', PlaceIcons.getIconForPlace(p1)); JsUnit.assertEquals('city-symbolic', PlaceIcons.getIconForPlace(p2)); JsUnit.assertEquals('pub-symbolic', PlaceIcons.getIconForPlace(p3)); + JsUnit.assertEquals('shopping-cart-symbolic', + PlaceIcons.getIconForPlace(p4)); + JsUnit.assertEquals('map-marker-symbolic', PlaceIcons.getIconForPlace(p5)); } // test that some unknown type gets the default map marker icon |