@fleetbase/fleetops-engine 0.6.55 → 0.6.57

package/addon/components/order/details.hbs

@@ -2,8 +2,24 @@
     {{#if (has-block)}}
         {{yield
             (hash
+                RegistryYieldStart=(component
+                    "registry-yield"
+                    registry="fleet-ops:component:order:details:start"
+                    resource=@resource
+                    controller=@controller
+                    permission=(get-write-permission @resource)
+                    isLoading=@isLoading
+                )
                 Activity=(component "order/details/activity" resource=@resource onChange=this.handleActivityChanged isLoadingActivity=@isLoadingActivity isLoading=@isLoading)
                 Detail=(component "order/details/detail" resource=@resource onChange=@onDetailsChanged isLoading=@isLoading)
+                RegistryYieldAfterDetails=(component
+                    "registry-yield"
+                    registry="fleet-ops:component:order:details:after-details"
+                    resource=@resource
+                    controller=@controller
+                    permission=(get-write-permission @resource)
+                    isLoading=@isLoading
+                )
                 CustomFields=(component "order/details/custom-fields" resource=@resource onChange=@onCustomFieldsChanged isLoading=@isLoading)
                 PurchaseRate=(component "order/details/purchase-rate" resource=@resource isLoading=@isLoading)
                 Tracking=(component "order/details/tracking" resource=@resource isLoading=@isLoading)
@@ -18,11 +34,25 @@
                 Documents=(component "order/details/documents" resource=@resource onChange=@onDocumentsChanged isLoading=@isLoading)
                 Comments=(component "order/details/comments" resource=@resource onChange=@onCommentsChanged isLoading=@isLoading)
                 Metadata=(component "order/details/metadata" resource=@resource onChange=@onMetadataChanged isLoading=@isLoading)
+                RegistryYieldEnd=(component
+                    "registry-yield"
+                    registry="fleet-ops:component:order:details:end"
+                    resource=@resource
+                    controller=@controller
+                    permission=(get-write-permission @resource)
+                    isLoading=@isLoading
+                )
             )
         }}
     {{else}}
+        <RegistryYield @registry="fleet-ops:component:order:details:start" as |RegistryComponent|>
+            <RegistryComponent @resource={{@resource}} @controller={{@controller}} @permission={{get-write-permission @resource}} @isLoading={{@isLoading}} />
+        </RegistryYield>
         <Order::Details::Activity @resource={{@resource}} @onChange={{this.handleActivityChanged}} @isLoadingActivity={{@isLoadingActivity}} @isLoading={{@isLoading}} />
         <Order::Details::Detail @resource={{@resource}} @onChange={{@onDetailsChanged}} @isLoading={{@isLoading}} />
+        <RegistryYield @registry="fleet-ops:component:order:details:after-details" as |RegistryComponent|>
+            <RegistryComponent @resource={{@resource}} @controller={{@controller}} @permission={{get-write-permission @resource}} @isLoading={{@isLoading}} />
+        </RegistryYield>
         <Order::Details::CustomFields @resource={{@resource}} @onChange={{@onCustomFieldsChanged}} @isLoading={{@isLoading}} />
         <Order::Details::PurchaseRate @resource={{@resource}} @isLoading={{@isLoading}} />
         <Order::Details::Tracking @resource={{@resource}} @isLoading={{@isLoading}} />
@@ -37,5 +67,8 @@
         <Order::Details::Documents @resource={{@resource}} @onChange={{@onDocumentsChanged}} @isLoading={{@isLoading}} />
         <Order::Details::Comments @resource={{@resource}} @onChange={{@onCommentsChanged}} @isLoading={{@isLoading}} />
         <Order::Details::Metadata @resource={{@resource}} @onChange={{@onMetadataChanged}} @isLoading={{@isLoading}} />
+        <RegistryYield @registry="fleet-ops:component:order:details:end" as |RegistryComponent|>
+            <RegistryComponent @resource={{@resource}} @controller={{@controller}} @permission={{get-write-permission @resource}} @isLoading={{@isLoading}} />
+        </RegistryYield>
     {{/if}}
-</div>
+</div>

package/addon/components/order/form/details.hbs

@@ -234,6 +234,10 @@
                 />
             </InputGroup>
         </div>
+
+        <RegistryYield @registry="fleet-ops:component:order:form:details" as |RegistryComponent|>
+            <RegistryComponent @order={{@resource}} @resource={{@resource}} />
+        </RegistryYield>
     </div>
 </ContentPanel>
 

package/addon/components/order/form.hbs

@@ -2,6 +2,7 @@
     {{#if (has-block)}}
         {{yield
             (hash
+                RegistryYieldStart=(component "registry-yield" registry="fleet-ops:component:order:form:start" order=@resource)
                 Details=(component "order/form/details" resource=@resource)
                 CustomFields=(component "order/form/custom-fields" resource=@resource customFields=@customFields)
                 Route=(component "order/form/route" resource=@resource)
@@ -12,9 +13,13 @@
                 Documents=(component "order/form/documents" resource=@resource)
                 OrchestratorConstraints=(component "order/form/orchestrator-constraints" resource=@resource)
                 Metadata=(component "order/form/metadata" resource=@resource)
+                RegistryYieldEnd=(component "registry-yield" registry="fleet-ops:component:order:form:end" order=@resource)
             )
         }}
     {{else}}
+        <RegistryYield @registry="fleet-ops:component:order:form:start" as |RegistryComponent|>
+            <RegistryComponent @order={{@resource}} @resource={{@resource}} />
+        </RegistryYield>
         <Order::Form::Details @resource={{@resource}} />
         <Order::Form::Route @resource={{@resource}} />
         <RegistryYield @registry="fleet-ops:component:order:form" as |RegistryComponent|>
@@ -26,5 +31,8 @@
         <Order::Form::Documents @resource={{@resource}} />
         <Order::Form::OrchestratorConstraints @resource={{@resource}} />
         <Order::Form::Metadata @resource={{@resource}} />
+        <RegistryYield @registry="fleet-ops:component:order:form:end" as |RegistryComponent|>
+            <RegistryComponent @order={{@resource}} @resource={{@resource}} />
+        </RegistryYield>
     {{/if}}
-</div>
+</div>

package/addon/components/telematic/details.hbs

@@ -92,7 +92,7 @@
                     <div class="rounded-md border border-gray-200 p-3 dark:border-gray-700 md:col-span-2">
                         <div class="text-gray-400 dark:text-gray-500">Update Mode</div>
                         <div class="mt-1 font-semibold text-gray-900 dark:text-gray-100">Provider polling</div>
-                        <div class="mt-1 text-gray-500 dark:text-gray-400">FleetOps polls this provider for device snapshots and telemetry updates.</div>
+                        <div class="mt-1 text-gray-500 dark:text-gray-400">Fleet-Ops polls this provider for device snapshots and telemetry updates.</div>
                     </div>
                 {{/if}}
             </div>

package/addon/components/telematic/form.hbs

@@ -70,7 +70,7 @@
                 <div class="mb-3">
                     <div>
                         <h2 class="text-sm font-bold text-gray-900 dark:text-gray-100">Credentials</h2>
-                        <p class="text-xs text-gray-500 dark:text-gray-300">FleetOps uses these credentials to test the connection and sync devices.</p>
+                        <p class="text-xs text-gray-500 dark:text-gray-300">Fleet-Ops uses these credentials to test the connection and sync devices.</p>
                     </div>
                 </div>
 
@@ -266,7 +266,7 @@
                     </InputGroup>
                 {{else}}
                     <div class="rounded-md border border-dashed border-gray-300 p-3 text-xs text-gray-500 dark:border-gray-700 dark:text-gray-300 lg:col-span-2">
-                        This provider does not require FleetOps webhook configuration.
+                        This provider does not require Fleet-Ops webhook configuration.
                     </div>
                 {{/if}}
             </div>

package/addon/components/telematic/settings.hbs

@@ -112,7 +112,7 @@
                     {{/if}}
                 {{else}}
                     <div class="rounded-md border border-dashed border-gray-300 p-3 text-xs text-gray-500 dark:border-gray-700 dark:text-gray-300">
-                        This provider does not require FleetOps webhook configuration.
+                        This provider does not require Fleet-Ops webhook configuration.
                     </div>
                 {{/if}}
             </section>

package/addon/components/vehicle/card.hbs

@@ -1,10 +1,16 @@
 <Layout::Resource::Card ...attributes as |Card|>
     <Card.header class="{{@headerClass}}">
+        <RegistryYield @registry="fleet-ops:component:vehicle:card:header:start" as |RegistryComponent|>
+            <RegistryComponent @order={{@resource}} @resource={{@resource}} />
+        </RegistryYield>
         <div class="font-semibold w-full truncate">{{or @resource.name @resource.yearMakeModel}}</div>
-        <div class="text-gray-300 dark:text-gray-500 text-sm w-full truncate">{{or @resource.plate_number @resource.vin @resource.serial_number @resource.call_sign @resource.public_id}}</div>
+        <div class="text-gray-400 dark:text-gray-500 text-sm w-full truncate">{{or @resource.plate_number @resource.vin @resource.serial_number @resource.call_sign @resource.public_id}}</div>
         {{#if (has-block "header")}}
             {{yield to="header"}}
         {{/if}}
+        <RegistryYield @registry="fleet-ops:component:vehicle:card:header:end" as |RegistryComponent|>
+            <RegistryComponent @order={{@resource}} @resource={{@resource}} />
+        </RegistryYield>
     </Card.header>
     <Card.body class={{@bodyClass}}>
         <Image src={{@resource.photo_url}} class="card-img-lg" />
@@ -13,16 +19,22 @@
         {{/if}}
     </Card.body>
     <Card.footer class={{@footerClass}}>
+        <RegistryYield @registry="fleet-ops:component:vehicle:card:footer:start" as |RegistryComponent|>
+            <RegistryComponent @order={{@resource}} @resource={{@resource}} />
+        </RegistryYield>
         <div class="flex flex-row items-center space-x-1">
             <Button @icon="eye" @size="xs" @onClick={{fn this.vehicleActions.transition.view @resource}} />
             <Button @icon="pencil" @size="xs" @onClick={{fn this.vehicleActions.transition.edit @resource}} />
             <Button @icon="trash" @size="xs" @type="danger" @onClick={{fn this.vehicleActions.delete @resource}} />
         </div>
+        <RegistryYield @registry="fleet-ops:component:vehicle:card:footer:end" as |RegistryComponent|>
+            <RegistryComponent @order={{@resource}} @resource={{@resource}} />
+        </RegistryYield>
         {{#if (has-block "footer")}}
             {{yield to="footer"}}
         {{/if}}
         <div class="mt-1.5">
-            <div class="text-gray-300 dark:text-gray-500 text-xs">Last Modified: {{@resource.updatedAt}}</div>
+            <div class="text-gray-400 dark:text-gray-500 text-xs">Last Modified: {{@resource.updatedAt}}</div>
         </div>
     </Card.footer>
 </Layout::Resource::Card>

package/addon/components/vehicle/form.hbs

@@ -1,4 +1,8 @@
 <div class="form-wrapper" ...attributes>
+    <RegistryYield @registry="fleet-ops:component:vehicle:form:start" as |RegistryComponent|>
+        <RegistryComponent @resource={{@resource}} @controller={{this.controller}} @permission={{get-write-permission @resource}} />
+    </RegistryYield>
+
     {{! DETAILS / IDENTIFICATION }}
     <ContentPanel @title={{t "common.details"}} @open={{true}} @wrapperClass="bordered-top">
         <div class="flex flex-row space-x-3 mb-3">
@@ -128,6 +132,10 @@
         </RegistryYield>
     </ContentPanel>
 
+    <RegistryYield @registry="fleet-ops:component:vehicle:form:after-details" as |RegistryComponent|>
+        <RegistryComponent @resource={{@resource}} @controller={{this.controller}} @permission={{get-write-permission @resource}} />
+    </RegistryYield>
+
     {{! MEASUREMENT & UNITS / ODOMETER }}
     <ContentPanel @title="Measurement & Units" @open={{true}} @wrapperClass="bordered-top">
         <div class="grid grid-cols-1 gap-2 lg:grid-cols-2 lg:gap-2 no-input-group-padding text-xs">
@@ -608,4 +616,8 @@
     <ContentPanel @title={{t "common.metadata"}} @open={{true}} @wrapperClass="bordered-top">
         <MetadataEditor @value={{@resource.meta}} @onChange={{fn (mut @resource.meta)}} />
     </ContentPanel>
-</div>
+
+    <RegistryYield @registry="fleet-ops:component:vehicle:form:end" as |RegistryComponent|>
+        <RegistryComponent @resource={{@resource}} @controller={{this.controller}} @permission={{get-write-permission @resource}} />
+    </RegistryYield>
+</div>

package/addon/controllers/connectivity/devices/index/details/events.js

@@ -56,7 +56,7 @@ export default class ConnectivityDevicesIndexDetailsEventsController extends Con
     }
 
     get unprocessedEventsCount() {
-        return this.events.filter((event) => !event.processed_at && !event.is_processed).length;
+        return this.events.filter((event) => !event.processed_at).length;
     }
 
     get processedEventsCount() {

package/addon/controllers/connectivity/devices/index/details/vehicle.js

@@ -86,13 +86,13 @@ export default class ConnectivityDevicesIndexDetailsVehicleController extends Co
 
     @action openVehicle() {
         if (this.vehicle?.id) {
-            return this.hostRouter.transitionTo('console.fleet-ops.management.vehicles.index.details', this.vehicle);
+            return this.hostRouter.transitionTo('console.fleet-ops.management.vehicles.index.details', this.vehicle.public_id);
         }
     }
 
     @action openVehiclePositions() {
         if (this.vehicle?.id) {
-            return this.hostRouter.transitionTo('console.fleet-ops.management.vehicles.index.details.positions', this.vehicle);
+            return this.hostRouter.transitionTo('console.fleet-ops.management.vehicles.index.details.positions', this.vehicle.public_id);
         }
     }
 

package/addon/controllers/connectivity/events/details.js

@@ -1,3 +1,70 @@
 import Controller from '@ember/controller';
+import { action, set } from '@ember/object';
+import { inject as service } from '@ember/service';
+import { tracked } from '@glimmer/tracking';
 
-export default class ConnectivityEventsDetailsController extends Controller {}
+function firstPresent(...values) {
+    return values.find((value) => value !== undefined && value !== null && value !== '');
+}
+
+function toDate(value) {
+    if (value instanceof Date) {
+        return value;
+    }
+
+    const date = new Date(value);
+
+    return Number.isNaN(date.getTime()) ? value : date;
+}
+
+export default class ConnectivityEventsDetailsController extends Controller {
+    @service deviceEventActions;
+    @service hostRouter;
+
+    @tracked isMarkingProcessed = false;
+
+    get event() {
+        return this.model;
+    }
+
+    get isProcessed() {
+        return Boolean(firstPresent(this.event?.processed_at, this.event?.processedAt));
+    }
+
+    get processedStatus() {
+        return this.isProcessed ? 'success' : 'warning';
+    }
+
+    get processedLabel() {
+        return this.isProcessed ? 'Processed' : 'Unprocessed';
+    }
+
+    @action goBack() {
+        return this.hostRouter.transitionTo('console.fleet-ops.connectivity.events.index');
+    }
+
+    @action refresh() {
+        return this.hostRouter.refresh();
+    }
+
+    @action async markProcessed() {
+        if (this.isMarkingProcessed) {
+            return;
+        }
+
+        this.isMarkingProcessed = true;
+
+        try {
+            const response = await this.deviceEventActions.markProcessed(this.event);
+            const processedAt = firstPresent(response?.device_event?.processed_at, response?.device_event?.processedAt, new Date());
+
+            if (this.event) {
+                set(this.event, 'processed_at', toDate(processedAt));
+            }
+
+            return response;
+        } finally {
+            this.isMarkingProcessed = false;
+        }
+    }
+}

package/addon/controllers/connectivity/sensors/index.js

@@ -178,6 +178,8 @@ export default class ConnectivitySensorsIndexController extends Controller {
             filterParam: 'type',
             filterComponent: 'filter/multi-option',
             filterOptions: fleetOpsOptions('sensorTypes'),
+            filterOptionLabel: 'label',
+            filterOptionValue: 'value',
         },
         {
             label: 'Last Value',
@@ -200,6 +202,8 @@ export default class ConnectivitySensorsIndexController extends Controller {
             filterable: true,
             filterComponent: 'filter/multi-option',
             filterOptions: fleetOpsOptions('sensorStatuses'),
+            filterOptionLabel: 'label',
+            filterOptionValue: 'value',
         },
         {
             label: 'Threshold',

package/addon/controllers/connectivity/telematics/details/events.js

@@ -40,7 +40,7 @@ export default class ConnectivityTelematicsDetailsEventsController extends Contr
     }
 
     get unprocessedEventsCount() {
-        return this.events.filter((event) => !event.processed_at && !event.is_processed).length;
+        return this.events.filter((event) => !event.processed_at).length;
     }
 
     get deviceCount() {

package/addon/controllers/connectivity/telematics/details/sensors.js

@@ -171,6 +171,8 @@ export default class ConnectivityTelematicsDetailsSensorsController extends Cont
                 filterParam: 'type',
                 filterComponent: 'filter/multi-option',
                 filterOptions: fleetOpsOptions('sensorTypes'),
+                filterOptionLabel: 'label',
+                filterOptionValue: 'value',
             },
             {
                 label: 'Device',
@@ -209,6 +211,8 @@ export default class ConnectivityTelematicsDetailsSensorsController extends Cont
                 filterable: true,
                 filterComponent: 'filter/multi-option',
                 filterOptions: fleetOpsOptions('sensorStatuses'),
+                filterOptionLabel: 'label',
+                filterOptionValue: 'value',
             },
             {
                 label: 'Last Reading',

package/addon/controllers/settings/map.js

@@ -19,6 +19,12 @@ export default class SettingsMapController extends Controller {
      * @var {Array}
      */
     @tracked mapProviderOptions = MAP_PROVIDER_OPTIONS;
+    @tracked googleMapsMapTypeOptions = [
+        { label: 'Roadmap', value: 'roadmap' },
+        { label: 'Satellite', value: 'satellite' },
+        { label: 'Hybrid', value: 'hybrid' },
+        { label: 'Terrain', value: 'terrain' },
+    ];
 
     /**
      * The currently-selected map provider key (e.g. 'leaflet' or 'google').
@@ -27,6 +33,9 @@ export default class SettingsMapController extends Controller {
      * @var {String}
      */
     @tracked mapProvider = 'leaflet';
+    @tracked googleMapsMapType = 'roadmap';
+    @tracked showGoogleMapsTrafficLayer = false;
+    @tracked showGoogleMapsTransitLayer = false;
 
     /**
      * Whether settings have been loaded from the server.
@@ -68,6 +77,9 @@ export default class SettingsMapController extends Controller {
     @task *saveSettings() {
         const settings = {
             mapProvider: this.mapProvider,
+            googleMapsMapType: this.googleMapsMapType,
+            showGoogleMapsTrafficLayer: this.showGoogleMapsTrafficLayer,
+            showGoogleMapsTransitLayer: this.showGoogleMapsTransitLayer,
         };
 
         try {
@@ -78,6 +90,10 @@ export default class SettingsMapController extends Controller {
                 this.mapManager.setActiveProvider(this.mapProvider);
             }
 
+            if (this.mapProvider === 'google' && typeof this.mapManager?.applyViewSettingsFromSettings === 'function') {
+                yield this.mapManager.applyViewSettingsFromSettings();
+            }
+
             this.notifications.success(this.intl.t('settings.map.settings-saved'));
         } catch (error) {
             this.notifications.serverError(error);
@@ -89,6 +105,9 @@ export default class SettingsMapController extends Controller {
             const response = yield this.mapSettings.load({ force: true });
 
             this.mapProvider = response?.mapProvider ?? 'leaflet';
+            this.googleMapsMapType = response?.googleMapsMapType ?? 'roadmap';
+            this.showGoogleMapsTrafficLayer = Boolean(response?.showGoogleMapsTrafficLayer);
+            this.showGoogleMapsTransitLayer = Boolean(response?.showGoogleMapsTransitLayer);
             this.settingsLoaded = true;
         } catch (error) {
             this.notifications.serverError(error);

package/addon/extension.js

@@ -116,6 +116,7 @@ export default {
 
         // Create registries
         this.createRegistries(registryService);
+        registryService.registerRenderableComponent('ai:action-preview:fleet-ops.create_order', new ExtensionComponent('@fleetbase/fleetops-engine', 'ai/create-order-preview'));
 
         // // Register console home guidance
         // this.registerHomeComponents(registryService);
@@ -368,6 +369,13 @@ export default {
             'fleet-ops:component:place:form:details',
             'fleet-ops:component:vehicle:form',
             'fleet-ops:component:vehicle:form:details',
+            'fleet-ops:component:vehicle:form:after-details',
+            'fleet-ops:component:vehicle:form:start',
+            'fleet-ops:component:vehicle:form:end',
+            'fleet-ops:component:vehicle:card:header:start',
+            'fleet-ops:component:vehicle:card:header:end',
+            'fleet-ops:component:vehicle:card:footer:start',
+            'fleet-ops:component:vehicle:card:footer:end',
             'fleet-ops:component:vendor:form:edit',
             'fleet-ops:component:vendor:form:edit:details',
             'fleet-ops:component:vendor:form:create',
@@ -392,6 +400,12 @@ export default {
             'fleet-ops:contextmenu:driver',
             'fleet-ops:component:order:details',
             'fleet-ops:component:order:form',
+            'fleet-ops:component:order:form:start',
+            'fleet-ops:component:order:form:end',
+            'fleet-ops:component:order:form:details',
+            'fleet-ops:component:order:form:details:start',
+            'fleet-ops:component:order:form:details:end',
+            'fleet-ops:component:order:form:details:after-details',
             'fleet-ops:component:order:form:payload:entity',
             'fleet-ops:component:order:form:payload:entity:form',
             'fleet-ops:template:settings:routing',

package/addon/instance-initializers/register-vroom-allocation.js

@@ -10,7 +10,7 @@
  * Third-party orchestration engines follow the same pattern:
  *   1. Create a service extending OrchestrationEngineInterfaceService
  *   2. Create an instance initializer that calls orchestrationEngine.register()
- *   3. The engine will appear in the FleetOps orchestrator settings dropdown
+ *   3. The engine will appear in the Fleet-Ops orchestrator settings dropdown
  */
 export function initialize(appInstance) {
     const orchestrationEngine = appInstance.lookup('service:orchestration-engine');

package/addon/routes/connectivity/events/details.js

@@ -1,3 +1,28 @@
 import Route from '@ember/routing/route';
+import { action } from '@ember/object';
+import { inject as service } from '@ember/service';
 
-export default class ConnectivityEventsDetailsRoute extends Route {}
+export default class ConnectivityEventsDetailsRoute extends Route {
+    @service abilities;
+    @service hostRouter;
+    @service intl;
+    @service notifications;
+    @service store;
+
+    @action error(error) {
+        this.notifications.serverError(error);
+
+        return this.hostRouter.transitionTo('console.fleet-ops.connectivity.events.index');
+    }
+
+    beforeModel() {
+        if (this.abilities.cannot('fleet-ops view device-event')) {
+            this.notifications.warning(this.intl.t('common.unauthorized-access'));
+            return this.hostRouter.transitionTo('console.fleet-ops.connectivity.events.index');
+        }
+    }
+
+    model({ public_id }) {
+        return this.store.findRecord('device-event', public_id);
+    }
+}

package/addon/routes/management/fleets/index/details.js

@@ -24,6 +24,6 @@ export default class ManagementFleetsIndexDetailsRoute extends Route {
     }
 
     model({ public_id }) {
-        return this.store.queryRecord('fleet', { public_id, single: true, with: ['parent_fleet', 'service_area', 'zone'] });
+        return this.store.queryRecord('fleet', { public_id, single: true, with: ['parent_fleet', 'service_area', 'zone', 'subfleets', 'drivers', 'vehicles'] });
     }
 }

package/addon/routes/management/vehicles/index/details.js

@@ -28,6 +28,8 @@ export default class ManagementVehiclesIndexDetailsRoute extends Route {
     }
 
     afterModel(model) {
-        model.loadDriver();
+        if (model && typeof model.loadDriver === 'function') {
+            model.loadDriver();
+        }
     }
 }

package/addon/services/map-adapter/google.js

@@ -62,6 +62,16 @@ const DEFAULT_GOOGLE_MAP_STYLES = [
     },
 ];
 
+function buildGoogleMapStyles({ showTransitLayer = false, googleOptions = {} } = {}) {
+    const baseStyles = showTransitLayer ? DEFAULT_GOOGLE_MAP_STYLES.filter((style) => style.featureType !== 'transit') : DEFAULT_GOOGLE_MAP_STYLES;
+
+    if (googleOptions.styles === undefined) {
+        return baseStyles;
+    }
+
+    return [...baseStyles, ...googleOptions.styles];
+}
+
 function buildWaypointMarkerContent(label, color) {
     const wrapper = document.createElement('div');
     wrapper.className = 'fleetops-map-marker';
@@ -108,6 +118,12 @@ export default class GoogleMapsAdapter extends MapAdapterInterface {
     /** @type {google.maps.ImageMapType|null} */
     _customTileLayer = null;
 
+    /** @type {google.maps.TrafficLayer|null} */
+    _trafficLayer = null;
+
+    /** @type {google.maps.TransitLayer|null} */
+    _transitLayer = null;
+
     /** @type {Map<string, Function[]>} Normalized event name → array of [handler, gmListener] pairs */
     _eventListeners = new Map();
 
@@ -160,7 +176,10 @@ export default class GoogleMapsAdapter extends MapAdapterInterface {
         const { AdvancedMarkerElement } = await googleMaps.maps.importLibrary('marker');
         this._advancedMarkerElementClass = AdvancedMarkerElement;
         const mergedGoogleOptions = options.googleOptions ?? {};
-        const mergedMapStyles = mergedGoogleOptions.styles === undefined ? DEFAULT_GOOGLE_MAP_STYLES : [...DEFAULT_GOOGLE_MAP_STYLES, ...mergedGoogleOptions.styles];
+        const mergedMapStyles = buildGoogleMapStyles({
+            showTransitLayer: options.showTransitLayer,
+            googleOptions: mergedGoogleOptions,
+        });
         const mapId = options.mapId ?? mergedGoogleOptions.mapId ?? this.#getConfig()?.googleMaps?.mapId ?? this.#getConfig()?.GOOGLE_MAPS_MAP_ID ?? null;
         this._supportsAdvancedMarkers = Boolean(mapId && mapId !== 'FLEETOPS_MAP');
 
@@ -176,6 +195,7 @@ export default class GoogleMapsAdapter extends MapAdapterInterface {
             styles: mergedMapStyles,
         });
 
+        await this.applyViewSettings(options);
         await this.#initDrawingManager();
 
         debug('[GoogleMapsAdapter] Map initialized');
@@ -231,6 +251,10 @@ export default class GoogleMapsAdapter extends MapAdapterInterface {
         this._tooltipOverlayView?.setMap?.(null);
         this._tooltipOverlayView = null;
         this._supportsAdvancedMarkers = false;
+        this._trafficLayer?.setMap(null);
+        this._trafficLayer = null;
+        this._transitLayer?.setMap(null);
+        this._transitLayer = null;
 
         this._map = null;
         debug('[GoogleMapsAdapter] Map destroyed');
@@ -241,6 +265,47 @@ export default class GoogleMapsAdapter extends MapAdapterInterface {
         google.maps.event.trigger(this._map, 'resize');
     }
 
+    async applyViewSettings(options = {}) {
+        if (!this._map) return;
+
+        const googleMaps = window.google;
+        const { TrafficLayer, TransitLayer } = await googleMaps.maps.importLibrary('maps');
+        const mapTypeId = options.mapTypeId ?? googleMaps.maps.MapTypeId.ROADMAP;
+        const showTrafficLayer = Boolean(options.showTrafficLayer);
+        const showTransitLayer = Boolean(options.showTransitLayer);
+        const googleOptions = options.googleOptions ?? {};
+
+        this._map.setMapTypeId?.(mapTypeId);
+        this._map.setOptions?.({
+            styles: buildGoogleMapStyles({
+                showTransitLayer,
+                googleOptions,
+            }),
+        });
+
+        if (showTrafficLayer) {
+            if (!this._trafficLayer) {
+                this._trafficLayer = new TrafficLayer();
+            }
+            this._trafficLayer.setMap(this._map);
+        } else if (this._trafficLayer) {
+            this._trafficLayer.setMap(null);
+            this._trafficLayer = null;
+        }
+
+        if (showTransitLayer) {
+            if (!this._transitLayer) {
+                this._transitLayer = new TransitLayer();
+            }
+            this._transitLayer.setMap(this._map);
+        } else if (this._transitLayer) {
+            this._transitLayer.setMap(null);
+            this._transitLayer = null;
+        }
+
+        debug(`[GoogleMapsAdapter] Applied view settings: mapTypeId=${mapTypeId}, traffic=${showTrafficLayer}, transit=${showTransitLayer}`);
+    }
+
     // ─── Viewport ──────────────────────────────────────────────────────────────
 
     setCenter(lat, lng, zoom) {

package/addon/services/map-adapter/leaflet.js

@@ -3,7 +3,7 @@
  *
  * Implements the MapAdapterInterface using the Leaflet library (via ember-leaflet).
  * This adapter wraps all existing Leaflet-specific logic, preserving 100% of
- * the original FleetOps map functionality while conforming to the provider-agnostic
+ * the original Fleet-Ops map functionality while conforming to the provider-agnostic
  * interface.
  *
  * All Leaflet-specific plugins are supported:

package/addon/services/map-adapter-interface.js

@@ -2,7 +2,7 @@
  * MapAdapterInterface
  *
  * Abstract base class that defines the standardized contract all map provider
- * adapters must implement. This enables FleetOps to support multiple map
+ * adapters must implement. This enables Fleet-Ops to support multiple map
  * providers (Leaflet, Google Maps, Mapbox, etc.) without changing any
  * application-level business logic.
  *