diff --git a/public/js/pages/PreorderRimoTypeMap/PreorderRimoTypeMap.css b/public/js/pages/PreorderRimoTypeMap/PreorderRimoTypeMap.css index ddd526f1c..5479da9d0 100644 --- a/public/js/pages/PreorderRimoTypeMap/PreorderRimoTypeMap.css +++ b/public/js/pages/PreorderRimoTypeMap/PreorderRimoTypeMap.css @@ -348,4 +348,4 @@ div.leaflet-marker-icon.custom-div-icon { .marker-multiple-dwelling { background-color: #6f42c1; } .marker-public { background-color: #17a2b8; } .marker-other { background-color: #bf2d69; } -.marker-gross { background-color: #6c757d; } \ No newline at end of file +.marker-not-to-conenct { background-color: #6c757d !important; } \ No newline at end of file diff --git a/public/js/pages/PreorderRimoTypeMap/PreorderRimoTypeMap.js b/public/js/pages/PreorderRimoTypeMap/PreorderRimoTypeMap.js index 665229c08..11e83635b 100644 --- a/public/js/pages/PreorderRimoTypeMap/PreorderRimoTypeMap.js +++ b/public/js/pages/PreorderRimoTypeMap/PreorderRimoTypeMap.js @@ -34,7 +34,6 @@ Vue.component('PreorderRimoTypeMap', { 'multiple-dwelling': {text: 'Mehrfamilienhaus', icon: 'fas fa-city', color: '#6f42c1'}, public: {text: 'Öffentlich', icon: 'fas fa-school', color: '#17a2b8'}, other: {text: 'Andere', icon: 'fas fa-question-circle', color: '#bf2d69'}, - gross: {text: 'Großanschluss', icon: 'fas fa-industry', color: '#6c757d'} } }), computed: { @@ -186,7 +185,8 @@ Vue.component('PreorderRimoTypeMap', { groupedData[latLngKey].original_items.push(item); }); return Object.values(groupedData).map(group => { - const rimoType = group.rimo_op_state === 'Not2Connect' ? 'gross' : this.getNormalizedRimoType(group.rimo_type); + const isNot2Connect = group.rimo_op_state === 'Not2Connect'; + const rimoType = this.getNormalizedRimoType(group.rimo_type); const markerIcon = this.getMarkerIcon(rimoType); const fault = this.faults[group.hausnummer_id]; const hasFault = fault && !fault.done && (fault.reasons.length > 0 || (fault.other && fault.other.trim() !== '')); @@ -196,7 +196,7 @@ Vue.component('PreorderRimoTypeMap', { return { lat: group.gps_lat, lng: group.gps_long, rimoType, hausnummerId: group.hausnummer_id, options: { - icon: {className: `custom-div-icon marker-${rimoType} ${hasFault ? 'marker-has-fault' : ''}`, html: `