Merge branch 'main' into normalize-phonenumbers-db

Author: beesaferoot

src/frontend/src/modules/Client/Client.vue

@@ -34,7 +34,7 @@
         <div class="client-detail-card">
           <widget :title="$tc('words.devices')" id="client-map">
             <client-map
-              :mappingService="mappingService.js"
+              :mappingService="mappingService"
               ref="clientMapRef"
               :edit="true"
               @locationEdited="deviceLocationsEditedSet"

src/frontend/src/modules/SolarHomeSystem/Location.vue

@@ -5,7 +5,7 @@
     :subscriber="'shs-location'"
   >
     <client-map
-      :mappingService="mappingService.js"
+      :mappingService="mappingService"
       ref="mapRef"
       :edit="false"
       :zoom="12"