Implement amenity icons mapping.

2026-10-14 14:46:12 +02:00 · 2016-11-14 11:35:09 +01:00
1 parent c61e2d9cc9
commit f462a11c1d
@@ -1 +1 @@
-L.Contao=L.Class.extend({includes:L.Mixin.Events,statics:{ATTRIBUTION:' | <a href="https://netzmacht.de/contao-leaflet" title="Powered by Leaflet extension for Contao CMS developed by netzmacht David Molineus">netzmacht</a>'},maps:{},icons:{},initialize:function(){L.Icon.Default.imagePath="assets/leaflet/libs/leaflet/images/",this.setGeoJsonListeners(L.GeoJSON)},addMap:function(t,o){return this.maps[t]=o,this.fire("map:added",{id:t,map:o}),this},getMap:function(t){return"undefined"==typeof this.maps[t]?null:this.maps[t]},addIcon:function(t,o){return this.icons[t]=o,this.fire("icon:added",{id:t,icon:o}),this},loadIcons:function(t){for(var o=0;o<t.length;o++){var e=L[t[o].type](t[o].options);this.addIcon(t[o].id,e)}},getIcon:function(t){return"undefined"==typeof this.icons[t]?null:this.icons[t]},load:function(t,o,e,n,i){var s=this.createRequestUrl(t,i),r=omnivore[o](s,e,n);return i&&(L.stamp(r),i.options.dynamicLoad&&"fit"==r.options.boundsMode&&(r.options.requestHash=t,i.on("moveend",r.refreshData,r),i.on("layerremove",function(t){t.layer===r&&i.off("moveend",r.updateBounds,r)})),i.fire("dataloading",{layer:r}),r.on("ready",function(){i.calculateFeatureBounds(r),i.fire("dataload",{layer:r})}),r.on("error",function(){i.fire("dataload",{layer:r})})),r},pointToLayer:function(t,o){var e="marker",n=null;if(t.properties&&(t.properties.bounds=!0,t.properties.type&&(e=t.properties.type),t.properties.arguments&&(n=L[e].apply(L[e],t.properties.arguments),L.Util.setOptions(n,t.properties.options))),null===n&&(n=L[e](o,t.properties.options)),t.properties){if(t.properties.radius&&n.setRadius(t.properties.radius),t.properties.icon){var i=this.getIcon(t.properties.icon);i&&n.setIcon(i)}this.bindPopupFromFeature(n,t)}return this.fire("point:added",{marker:n,feature:t,latlng:o,type:e}),n},onEachFeature:function(t,o){t.properties&&(L.Util.setOptions(o,t.properties.options),this.bindPopupFromFeature(o,t),this.fire("feature:added",{feature:t,layer:o}))},bindPopupFromFeature:function(t,o){o.properties&&(o.properties.popup?t.bindPopup(o.properties.popup,o.properties.popupOptions):o.properties.popupContent&&t.bindPopup(o.properties.popupContent,o.properties.popupOptions))},setGeoJsonListeners:function(t){t&&t.prototype&&(t.prototype.options={pointToLayer:this.pointToLayer.bind(this),onEachFeature:this.onEachFeature.bind(this)})},createRequestUrl:function(t,o){var e,n="leaflet",i=document.location.search.substr(1).split("&");if(t=encodeURIComponent(t),""==i)t=document.location.pathname+"?"+[n,t].join("=");else{for(var s,r=i.length;r--;)if(s=i[r].split("="),s[0]==n){s[1]=t,i[r]=s.join("=");break}r<0&&(i[i.length]=[n,t].join("=")),t=document.location.pathname+"?"+i.join("&")}return o&&o.options.dynamicLoad&&(e=o.getBounds(),t+="&f=bbox&v=",t+=e.getSouth()+","+e.getWest(),t+=","+e.getNorth()+","+e.getEast()),t}}),L.contao=new L.Contao,L.Control.Attribution.addInitHook(function(){this.options.prefix+=L.Contao.ATTRIBUTION}),L.Control.Attribution.include({setPrefix:function(t){return t.indexOf(L.Contao.ATTRIBUTION)===-1&&(t+=L.Contao.ATTRIBUTION),this.options.prefix=t,this._update(),this}}),L.GeoJSON.include({refreshData:function(t){var o=L.geoJson(),e=this;o.on("ready",function(){var t,o=e.getLayers();for(t=0;t<o.length;t++)e.removeLayer(o[t]);for(o=this.getLayers(),t=0;t<o.length;t++)this.removeLayer(o[t]),e.addLayer(o[t])}),omnivore.geojson(L.contao.createRequestUrl(this.options.requestHash,t.target),null,o)}}),L.Map.include({_dynamicBounds:null,calculateFeatureBounds:function(t,o){if(t){if(!this.options.adjustBounds&&!o)return;this._scanForBounds(t)}else this.eachLayer(this._scanForBounds,this);this._dynamicBounds&&this.fitBounds(this._dynamicBounds,this.getBoundsOptions())},getBoundsOptions:function(){return options={},this.options.boundsPadding?options.padding=this.options.boundsPadding:(this.options.boundsPaddingTopLeft&&(options.paddingTopLeft=this.options.boundsPaddingTopLeft),this.options.boundsPaddingBottomRight&&(options.paddingBottomRight=this.options.boundsPaddingBottomRight)),options},_scanForBounds:function(t){var o;!t.feature||t.feature.properties&&t.feature.properties.ignoreForBounds?L.MarkerClusterGroup&&t instanceof L.MarkerClusterGroup&&t.options.boundsMode&&"extend"==t.options.boundsMode?(o=t.getBounds(),o.isValid()&&(this._dynamicBounds?this._dynamicBounds.extend(o):this._dynamicBounds=L.latLngBounds(o.getSouthWest(),o.getNorthEast()))):(!t.options||t.options&&t.options.boundsMode&&!t.options.ignoreForBounds)&&t.eachLayer&&t.eachLayer(this._scanForBounds,this):t.getBounds?(o=t.getBounds(),o.isValid()&&(this._dynamicBounds?this._dynamicBounds.extend(o):this._dynamicBounds=L.latLngBounds(o.getSouthWest(),o.getNorthEast()))):t.getLatLng&&(o=t.getLatLng(),this._dynamicBounds?this._dynamicBounds.extend(o):this._dynamicBounds=L.latLngBounds(o,o))}}),L.LatLngBounds.prototype.toOverpassBBoxString=function(){var t=this._southWest,o=this._northEast;return[t.lat,t.lng,o.lat,o.lng].join(",")},L.OverPassLayer=L.FeatureGroup.exLine truncated
+L.Contao=L.Class.extend({includes:L.Mixin.Events,statics:{ATTRIBUTION:' | <a href="https://netzmacht.de/contao-leaflet" title="Powered by Leaflet extension for Contao CMS developed by netzmacht David Molineus">netzmacht</a>'},maps:{},icons:{},initialize:function(){L.Icon.Default.imagePath="assets/leaflet/libs/leaflet/images/",this.setGeoJsonListeners(L.GeoJSON)},addMap:function(t,o){return this.maps[t]=o,this.fire("map:added",{id:t,map:o}),this},getMap:function(t){return"undefined"==typeof this.maps[t]?null:this.maps[t]},addIcon:function(t,o){return this.icons[t]=o,this.fire("icon:added",{id:t,icon:o}),this},loadIcons:function(t){for(var o=0;o<t.length;o++){var e=L[t[o].type](t[o].options);this.addIcon(t[o].id,e)}},getIcon:function(t){return"undefined"==typeof this.icons[t]?null:this.icons[t]},load:function(t,o,e,n,i){var s=this.createRequestUrl(t,i),a=omnivore[o](s,e,n);return i&&(L.stamp(a),i.options.dynamicLoad&&"fit"==a.options.boundsMode&&(a.options.requestHash=t,i.on("moveend",a.refreshData,a),i.on("layerremove",function(t){t.layer===a&&i.off("moveend",a.updateBounds,a)})),i.fire("dataloading",{layer:a}),a.on("ready",function(){i.calculateFeatureBounds(a),i.fire("dataload",{layer:a})}),a.on("error",function(){i.fire("dataload",{layer:a})})),a},pointToLayer:function(t,o){var e="marker",n=null;if(t.properties&&(t.properties.bounds=!0,t.properties.type&&(e=t.properties.type),t.properties.arguments&&(n=L[e].apply(L[e],t.properties.arguments),L.Util.setOptions(n,t.properties.options))),null===n&&(n=L[e](o,t.properties.options)),t.properties){if(t.properties.radius&&n.setRadius(t.properties.radius),t.properties.icon){var i=this.getIcon(t.properties.icon);i&&n.setIcon(i)}this.bindPopupFromFeature(n,t)}return this.fire("point:added",{marker:n,feature:t,latlng:o,type:e}),n},onEachFeature:function(t,o){t.properties&&(L.Util.setOptions(o,t.properties.options),this.bindPopupFromFeature(o,t),this.fire("feature:added",{feature:t,layer:o}))},bindPopupFromFeature:function(t,o){o.properties&&(o.properties.popup?t.bindPopup(o.properties.popup,o.properties.popupOptions):o.properties.popupContent&&t.bindPopup(o.properties.popupContent,o.properties.popupOptions))},setGeoJsonListeners:function(t){t&&t.prototype&&(t.prototype.options={pointToLayer:this.pointToLayer.bind(this),onEachFeature:this.onEachFeature.bind(this)})},createRequestUrl:function(t,o){var e,n="leaflet",i=document.location.search.substr(1).split("&");if(t=encodeURIComponent(t),""==i)t=document.location.pathname+"?"+[n,t].join("=");else{for(var s,a=i.length;a--;)if(s=i[a].split("="),s[0]==n){s[1]=t,i[a]=s.join("=");break}a<0&&(i[i.length]=[n,t].join("=")),t=document.location.pathname+"?"+i.join("&")}return o&&o.options.dynamicLoad&&(e=o.getBounds(),t+="&f=bbox&v=",t+=e.getSouth()+","+e.getWest(),t+=","+e.getNorth()+","+e.getEast()),t}}),L.contao=new L.Contao,L.Control.Attribution.addInitHook(function(){this.options.prefix+=L.Contao.ATTRIBUTION}),L.Control.Attribution.include({setPrefix:function(t){return t.indexOf(L.Contao.ATTRIBUTION)===-1&&(t+=L.Contao.ATTRIBUTION),this.options.prefix=t,this._update(),this}}),L.GeoJSON.include({refreshData:function(t){var o=L.geoJson(),e=this;o.on("ready",function(){var t,o=e.getLayers();for(t=0;t<o.length;t++)e.removeLayer(o[t]);for(o=this.getLayers(),t=0;t<o.length;t++)this.removeLayer(o[t]),e.addLayer(o[t])}),omnivore.geojson(L.contao.createRequestUrl(this.options.requestHash,t.target),null,o)}}),L.Map.include({_dynamicBounds:null,calculateFeatureBounds:function(t,o){if(t){if(!this.options.adjustBounds&&!o)return;this._scanForBounds(t)}else this.eachLayer(this._scanForBounds,this);this._dynamicBounds&&this.fitBounds(this._dynamicBounds,this.getBoundsOptions())},getBoundsOptions:function(){return options={},this.options.boundsPadding?options.padding=this.options.boundsPadding:(this.options.boundsPaddingTopLeft&&(options.paddingTopLeft=this.options.boundsPaddingTopLeft),this.options.boundsPaddingBottomRight&&(options.paddingBottomRight=this.options.boundsPaddingBottomRight)),options},_scanForBounds:function(t){var o;!t.feature||t.feature.properties&&t.feature.properties.ignoreForBounds?L.MarkerClusterGroup&&t instanceof L.MarkerClusterGroup&&t.options.boundsMode&&"extend"==t.options.boundsMode?(o=t.getBounds(),o.isValid()&&(this._dynamicBounds?this._dynamicBounds.extend(o):this._dynamicBounds=L.latLngBounds(o.getSouthWest(),o.getNorthEast()))):(!t.options||t.options&&t.options.boundsMode&&!t.options.ignoreForBounds)&&t.eachLayer&&t.eachLayer(this._scanForBounds,this):t.getBounds?(o=t.getBounds(),o.isValid()&&(this._dynamicBounds?this._dynamicBounds.extend(o):this._dynamicBounds=L.latLngBounds(o.getSouthWest(),o.getNorthEast()))):t.getLatLng&&(o=t.getLatLng(),this._dynamicBounds?this._dynamicBounds.extend(o):this._dynamicBounds=L.latLngBounds(o,o))}}),L.LatLngBounds.prototype.toOverpassBBoxString=function(){var t=this._southWest,o=this._northEast;return[t.lat,t.lng,o.lat,o.lng].join(",")},L.OverPassLayer=L.FeatureGroup.exLine truncated
@@ -18,7 +18,8 @@ L.OverPassLayer = L.FeatureGroup.extend({
    options: {
        minZoom: 0,
        endpoint: '//overpass-api.de/api/',
-        query: '(node(BBOX)[organic];node(BBOX)[second_hand];);out qt;'
+        query: '(node(BBOX)[organic];node(BBOX)[second_hand];);out qt;',
+        amenityIcons: {}
    },
    /**
     * Initialize the layer.
@@ -87,6 +88,7 @@ L.OverPassLayer = L.FeatureGroup.extend({
    },
    pointToLayer: function (feature, latlng) {
        var type   = 'marker';
+        var icon   = null;
        var marker = L.marker(latlng, feature.properties.options);

        if (feature.properties) {
@@ -95,12 +97,19 @@ L.OverPassLayer = L.FeatureGroup.extend({
            }

            if (feature.properties.icon) {
-                var icon = this._map.getIcon(feature.properties.icon);
+                icon = this._map.getIcon(feature.properties.icon);
+
+            } else if (feature.properties.tags
+                && feature.properties.tags.amenity
+                && this.options.amenityIcons[feature.properties.tags.amenity]
+            ) {
+                console.log(this.options.amenityIcons[feature.properties.tags.amenity]);
+                icon = L.contao.getIcon(this.options.amenityIcons[feature.properties.tags.amenity]);
+            }

            if (icon) {
                marker.setIcon(icon);
            }
-            }

            L.contao.bindPopupFromFeature(marker, feature);
        }
@@ -0,0 +1,213 @@
+<?php
+
+/**
+ * @package    contao-leaflet-maps
+ * @author     David Molineus <david.molineus@netzmacht.de>
+ * @copyright  2014-2016 netzmacht David Molineus
+ * @license    LGPL 3.0
+ * @filesource
+ *
+ */
+
+return [
+    'administration',
+    'advertising',
+    'alm',
+    'animal_boarding',
+    'animal_breeding',
+    'animal_shelter',
+    'architect_office',
+    'arts_centre',
+    'artwork',
+    'atm',
+    'audiologist',
+    'baby_hatch',
+    'bank',
+    'bar',
+    'bbq',
+    'bench',
+    'bicycle_parking',
+    'bicycle_rental',
+    'bicycle_repair_station',
+    'bicycle_trailer_sharing',
+    'biergarten',
+    'bikeshed',
+    'boat_rental',
+    'boat_sharing',
+    'boat_storage',
+    'brothel',
+    'bts',
+    'bureau_de_change',
+    'bus_station',
+    'cafe',
+    'canoe_hire',
+    'car_rental',
+    'car_repair',
+    'car_sharing',
+    'car_wash',
+    'casino',
+    'charging_station',
+    'childcare',
+    'cinema',
+    'citymap_post',
+    'clinic',
+    'clock',
+    'club',
+    'coast_guard',
+    'coast_radar_station',
+    'college',
+    'community_center',
+    'community_centre',
+    'compressed_air',
+    'concert_hall',
+    'conference_centre',
+    'courthouse',
+    'coworking_space',
+    'crematorium',
+    'crucifix',
+    'crypt',
+    'customs',
+    'dancing_school',
+    'dead_pub',
+    'dentist',
+    'disused',
+    'dive_centre',
+    'doctors',
+    'dog_bin',
+    'dog_waste_bin',
+    'dojo',
+    'drinking_water',
+    '_driving_school',
+    'education',
+    'embassy',
+    'emergency_phone',
+    'emergency_service',
+    'events_venue',
+    'ev_charging',
+    'exhibition_centre',
+    'fast_food',
+    'ferry_terminal',
+    'festival_grounds',
+    'financial_advice',
+    'fire_hydrant',
+    'fire_station',
+    'first_aid',
+    'fish_spa',
+    'food_court',
+    'fountain',
+    'fuel',
+    'gambling',
+    'game_feeding',
+    'garages',
+    'grave_yard',
+    'grit_bin',
+    'harbourmaster',
+    'hospice',
+    'hospital',
+    'hotel',
+    'hunting_stand',
+    'ice_cream',
+    'internet_cafe',
+    'jobcentre',
+    'kindergarten',
+    'kiosk',
+    'kitchen',
+    'Kneippbecken',
+    'kneipp_water_cure',
+    'language_school',
+    'lavoir',
+    'library',
+    'lifeboat_station',
+    'life_ring',
+    'loading_dock',
+    'love_hotel',
+    'marae',
+    'marketplace',
+    'milk_dispenser',
+    'mobile_library',
+    'monastery',
+    'money_transfer',
+    'mortuary',
+    'motorcycle_parking',
+    'motorcycle_rental',
+    'music_school',
+    'music_venue',
+    'nameplate',
+    'nightclub',
+    'nursery',
+    'nursing_home',
+    'park',
+    'parking',
+    'parking_entrance',
+    'parking_space',
+    'pharmacy',
+    'photo_booth',
+    'place_of_worship',
+    'planetarium',
+    'police',
+    'post_box',
+    'post_office',
+    'preschool',
+    'printer',
+    'prison',
+    'prison_camp',
+    'proposed',
+    'pub',
+    'public_bath',
+    'public_bookcase',
+    'public_building',
+    'public_hall',
+    'ranger_station',
+    'recycling',
+    'refugee_housing',
+    'register_office',
+    'rescue_box',
+    'rescue_station',
+    'research_institute',
+    'restaurant',
+    'retirement_home',
+    'sanatorium',
+    'sanitary_dump_station',
+    'sauna',
+    'school',
+    'scout_hut',
+    'shelter',
+    'shop',
+    'shower',
+    'ski_school',
+    'smoking_area',
+    'social_centre',
+    'social_facility',
+    'spa',
+    'stables',
+    'stripclub',
+    'studio',
+    'swimming_pool',
+    'swingerclub',
+    'table',
+    'taxi',
+    'telephone',
+    'theatre',
+    'ticket_booth',
+    'ticket_validator',
+    'toilets',
+    'townhall',
+    'trolley_bay',
+    'university',
+    'vacuum_cleaner',
+    'vehicle_inspection',
+    'vending_machine',
+    'veterinary',
+    'vivarium',
+    'wash_center',
+    'waste_basket',
+    'waste_disposal',
+    'waste_transfer_station',
+    'water',
+    'watering_place',
+    'water_point',
+    'weighbridge',
+    'winery',
+    'yacht_club',
+    'youth_centre',
+];
@@ -242,7 +242,8 @@ $container['leaflet.dca.layer-callbacks'] = $container->share(
            $container[Services::DATABASE_CONNECTION],
            $container[Services::TRANSLATOR],
            $GLOBALS['LEAFLET_LAYERS'],
-            $GLOBALS['LEAFLET_TILE_PROVIDERS']
+            $GLOBALS['LEAFLET_TILE_PROVIDERS'],
+            require TL_ROOT . '/system/modules/leaflet/config/leaflet_amenities.php'
        );
    }
 );
@@ -153,6 +153,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_layer'] = array
        'default' => array(
            'title'    => array('title', 'alias', 'type'),
            'config'   => array(),
+            'style'    => array(),
            'expert'   => array(':hide'),
            'active'   => array('active'),
        ),
@@ -217,9 +218,12 @@ $GLOBALS['TL_DCA']['tl_leaflet_layer'] = array
        'overpass extends default' => array(
            'config' => array(
                'overpassQuery',
-                'overpassEndpoint',
+                'boundsMode',
                'minZoom',
-                'boundsMode'
+                'overpassEndpoint',
+            ),
+            'style' => array(
+                'amenityIcons'
            ),
            '+expert' => array(
                'onEachFeature',
@@ -871,5 +875,41 @@ $GLOBALS['TL_DCA']['tl_leaflet_layer'] = array
            'eval'      => array('tl_class' => 'w50 m12'),
            'sql'       => "char(1) NOT NULL default ''"
        ),
+        'amenityIcons' => array
+        (
+            'label'     => &$GLOBALS['TL_LANG']['tl_leaflet_marker']['icon'],
+            'exclude'   => true,
+            'inputType' => 'multiColumnWizard',
+            'options_callback' => array('Netzmacht\Contao\Leaflet\Dca\MarkerCallbacks', 'getIcons'),
+            'eval'      => array(
+                'columnFields' => array(
+                    'amenity' => array(
+                        'label'     => &$GLOBALS['TL_LANG']['tl_leaflet_marker']['icon'],
+                        'exclude'   => true,
+                        'inputType' => 'select',
+                        'options_callback' => \Netzmacht\Contao\Leaflet\Dca\LayerCallbacks::callback('getAmenities'),
+                        'eval'      => array(
+                            'mandatory'  => true,
+                            'tl_class'   => 'w50',
+                            'style'      => 'width: 200px',
+                            'chosen'     => true,
+                        ),
+                    ),
+                    'icon' => array(
+                        'label'     => &$GLOBALS['TL_LANG']['tl_leaflet_marker']['icon'],
+                        'exclude'   => true,
+                        'inputType' => 'select',
+                        'options_callback' => array('Netzmacht\Contao\Leaflet\Dca\MarkerCallbacks', 'getIcons'),
+                        'eval'      => array(
+                            'mandatory'  => true,
+                            'tl_class'   => 'w50',
+                            'style'      => 'width: 200px',
+                            'chosen'     => true,
+                        ),
+                    ),
+                ),
+            ),
+            'sql'       => "blob NULL",
+        ),
    )
 );
@@ -66,6 +66,17 @@ class LayerCallbacks extends Callbacks
     */
    private $translator;

+    /**
+     * OSM amenities.
+     *
+     * @var array
+     */
+    private $amenities;
+    /**
+     * @var Manager
+     */
+    private $manager;
+
    /**
     * Construct.
     *
@@ -74,23 +85,26 @@ class LayerCallbacks extends Callbacks
     * @param Translator $translator    Translator.
     * @param array      $layers        Leaflet layer configuration.
     * @param array      $tileProviders Tile providers.
+     * @param array      $amenities     OSM amenities
     */
    public function __construct(
        Manager $manager,
        \Database $database,
        Translator $translator,
        array $layers,
-        array $tileProviders
+        array $tileProviders,
+        array $amenities
    ) {
        parent::__construct($manager);

+        \Controller::loadLanguageFile('leaflet_layer');
+
        $this->database      = $database;
        $this->layers        = $layers;
        $this->tileProviders = $tileProviders;
-
-        \Controller::loadLanguageFile('leaflet_layer');
-
+        $this->manager       = $manager;
        $this->translator    = $translator;
+        $this->amenities     = $amenities;
    }

    /**
@@ -359,6 +373,16 @@ class LayerCallbacks extends Callbacks
            ->getOptions();
    }

+    /**
+     * Get all know osm amenities as options.
+     *
+     * @return array
+     */
+    public function getAmenities()
+    {
+        return $this->amenities;
+    }
+
    /**
     * Generate a button.
     *
@@ -14,6 +14,7 @@ use Model;
 use Netzmacht\Contao\Leaflet\Definition\Layer\OverpassLayer;
 use Netzmacht\Contao\Leaflet\Filter\Filter;
 use Netzmacht\Contao\Leaflet\Mapper\DefinitionMapper;
+use Netzmacht\Contao\Leaflet\Model\IconModel;
 use Netzmacht\JavascriptBuilder\Type\Expression;
 use Netzmacht\LeafletPHP\Definition;

@@ -66,6 +67,9 @@ class OverpassLayerMapper extends AbstractLayerMapper
            return;
        }

+        $amenityIconsMap = $this->buildAmenityIconsMap($model);
+        $definition->setOption('amenityIcons', $amenityIconsMap);
+
        if ($model->pointToLayer) {
            $definition->setPointToLayer(new Expression($model->pointToLayer));
        }
@@ -74,4 +78,43 @@ class OverpassLayerMapper extends AbstractLayerMapper
            $definition->setOnEachFeature(new Expression($model->onEachFeature));
        }
    }
+
+    /**
+     * Build the amenity icons map.
+     *
+     * @param Model $model Definition model.
+     *
+     * @return array
+     */
+    protected function buildAmenityIconsMap(Model $model)
+    {
+        $amenityIconsConfig = deserialize($model->amenityIcons, true);
+        $amenityIconsMap    = [];
+        foreach ($amenityIconsConfig as $config) {
+            if (!$config['amenity'] || !$config['icon']) {
+                continue;
+            }
+
+            $amenityIconsMap[$config['amenity']] = $config['icon'];
+        }
+
+        if ($amenityIconsMap) {
+            $collection    = IconModel::findMultipleByIds(array_unique($amenityIconsMap));
+            $icons         = [];
+
+            if ($collection) {
+                foreach ($collection as $iconModel) {
+                    $icons[$iconModel->id] = $iconModel->alias ?: $iconModel->id;
+                }
+
+                foreach ($amenityIconsMap as $amenity => $iconId) {
+                    if (isset($icons[$iconId])) {
+                        $amenityIconsMap[$amenity] = $icons[$iconId];
+                    }
+                }
+            }
+        }
+
+        return $amenityIconsMap;
+    }
 }