@fleetbase/fleetops-engine 0.6.19 → 0.6.21

package/addon/utils/fleet-ops-options.js

@@ -403,6 +403,95 @@ export const serviceAreaTypes = [
     { label: 'Continent', value: 'continent', description: 'A global landmass encompassing multiple countries (e.g., Asia, Europe, Africa).' },
 ];
 
+export const telematicStatuses = [
+    { value: 'initialized', label: 'Initialized', description: 'Provider entry has been created but not yet configured.' },
+    { value: 'configured', label: 'Configured', description: 'Provider credentials and settings are valid but connection not yet tested.' },
+    { value: 'connecting', label: 'Connecting', description: 'Attempting to establish a connection with provider API.' },
+    { value: 'connected', label: 'Connected', description: 'Successfully authenticated and connected to provider API.' },
+    { value: 'synchronizing', label: 'Synchronizing', description: 'Currently syncing data (devices, vehicles, positions, etc.) from provider.' },
+    { value: 'active', label: 'Active', description: 'Integration is healthy and data syncs are occurring normally.' },
+    { value: 'degraded', label: 'Degraded', description: 'Integration partially working; intermittent errors or missing data.' },
+    { value: 'disconnected', label: 'Disconnected', description: 'Connection lost or failed authentication.' },
+    { value: 'error', label: 'Error', description: 'Provider integration encountered a fatal issue.' },
+    { value: 'disabled', label: 'Disabled', description: 'Manually disabled by the user.' },
+    { value: 'archived', label: 'Archived', description: 'Deprecated or replaced integration, kept for record.' },
+];
+
+export const telematicHealthStates = [
+    { value: 'healthy', label: 'Healthy', description: 'Integration tested and stable.' },
+    { value: 'warning', label: 'Warning', description: 'Minor issues detected (e.g., slow response, nearing quota).' },
+    { value: 'critical', label: 'Critical', description: 'Persistent failure or no data received in X hours.' },
+];
+
+export const deviceTypes = [
+    { label: 'GPS Tracker', value: 'gps_tracker', description: 'Standalone GPS tracking device installed in vehicle or asset.' },
+    { label: 'OBD-II Plug-in Device', value: 'obd2_plugin', description: 'Plugs into vehicle OBD-II port; reads diagnostics, engine data, and transmits telematics.' },
+    { label: 'CAN Bus Module', value: 'can_bus_module', description: 'Hard-wired module connected to vehicle CAN bus for detailed vehicle subsystem data.' },
+    { label: 'Dash Camera Telematics Unit', value: 'dashcam_unit', description: 'Camera + integrated telematics module capturing video and vehicle data.' },
+    {
+        label: 'Battery-Powered Asset Tracker',
+        value: 'battery_asset_tracker',
+        description: 'Self-powered wireless device for tracking non-powered assets (trailers, containers, equipment).',
+    },
+    { label: 'Smartphone App Device', value: 'smartphone_app_device', description: 'Mobile device running telematics/tracking app using phone sensors and connectivity.' },
+    { label: 'Hard-wired Black Box Module', value: 'hardwired_black_box', description: 'Permanently installed telematics control unit wired to vehicle electrical system for fleet use.' },
+    { label: 'Mobile Edge / IoT Gateway', value: 'mobile_edge_gateway', description: 'Multi-sensor/IoT gateway installed in vehicle or asset to aggregate sensor data and telematics.' },
+    {
+        label: 'Trailer/Container Telematic Sensor Node',
+        value: 'trailer_container_node',
+        description: 'Specialised telematics node for trailers, containers, intermodal assets, tracking location and status.',
+    },
+];
+
+export const sensorTypes = [
+    { label: 'GPS / GNSS Receiver', value: 'gps_gnss', description: 'Global positioning sensor providing latitude/longitude, speed and time information.' },
+    { label: 'Accelerometer', value: 'accelerometer', description: 'Measures linear acceleration; used to detect harsh braking, rapid acceleration, and movement.' },
+    { label: 'Gyroscope / IMU', value: 'gyroscope_imu', description: 'Inertial Measurement Unit estimating orientation, yaw/pitch/roll of vehicle or asset.' },
+    { label: 'Fuel Level Sensor', value: 'fuel_level', description: 'Measures remaining fuel in tank; used for fuel monitoring and consumption tracking.' },
+    { label: 'Tire Pressure Sensor (TPMS)', value: 'tire_pressure', description: 'Measures pressure (and often temperature) in tires for safety and maintenance.' },
+    { label: 'Engine Diagnostic / OBD Sensor', value: 'engine_diagnostic', description: 'Reads engine fault codes, RPM, engine hours, and other diagnostics via OBD or CAN.' },
+    { label: 'Temperature Sensor', value: 'temperature', description: 'Monitors ambient or equipment temperature; used for refrigerated cargo, battery health etc.' },
+    { label: 'Humidity Sensor', value: 'humidity', description: 'Detects moisture/humidity levels in cargo or enclosed spaces for condition monitoring.' },
+    { label: 'Door / Hatch Sensor', value: 'door_hatch', description: 'Monitors open/close status of doors, hatches or compartments for security/tracking.' },
+    { label: 'Vibration / Shock Sensor', value: 'vibration_shock', description: 'Measures vibration or shock events; suitable for freight, containers or equipment stability monitoring.' },
+    { label: 'Battery Voltage Sensor', value: 'battery_voltage', description: 'Monitors battery or electrical system voltage to detect low power or charging issues.' },
+    { label: 'Geofence / Entry-Exit Event Sensor', value: 'geofence_event', description: 'Triggers when asset enters/exits defined geographic zone; used for location-based alerts.' },
+    { label: 'Idle Time Sensor', value: 'idle_time', description: 'Tracks engine on with vehicle stationary; used to measure idling and optimize fuel/usage.' },
+    { label: 'Driver Behavior Sensor', value: 'driver_behavior', description: 'Aggregates data (speed, braking, cornering) to score driving behavior and safety.' },
+];
+
+export const deviceStatuses = [
+    { label: 'Inactive', value: 'inactive', description: 'Device record exists but has not yet been activated or assigned.' },
+    { label: 'Active', value: 'active', description: 'Device is online and actively communicating with the platform.' },
+    { label: 'Online', value: 'online', description: 'Device is currently connected and transmitting live data.' },
+    { label: 'Offline', value: 'offline', description: 'Device is powered off or has not transmitted data within the expected interval.' },
+    { label: 'Sleeping', value: 'sleeping', description: 'Device in low-power mode awaiting wake event or scheduled reporting interval.' },
+    { label: 'Idle', value: 'idle', description: 'Device is powered and connected but not moving or transmitting new telemetry.' },
+    { label: 'Maintenance', value: 'maintenance', description: 'Device is undergoing repair, firmware update, or service maintenance.' },
+    { label: 'Degraded', value: 'degraded', description: 'Device is partially functional; intermittent connectivity or incomplete data.' },
+    { label: 'Error', value: 'error', description: 'Device reported fault, hardware issue, or repeated communication errors.' },
+    { label: 'Disconnected', value: 'disconnected', description: 'Device lost connection to network or telematic gateway.' },
+    { label: 'Decommissioned', value: 'decommissioned', description: 'Device permanently retired or removed from active fleet use.' },
+    { label: 'Disabled', value: 'disabled', description: 'Device manually disabled by user or admin; data not being accepted.' },
+    { label: 'Pending Activation', value: 'pending_activation', description: 'Device provisioned but not yet verified or linked to telematic source.' },
+    { label: 'Provisioning', value: 'provisioning', description: 'Device configuration or initialization is in progress.' },
+];
+
+export const sensorStatuses = [
+    { label: 'Active', value: 'active', description: 'Sensor is online and transmitting readings as expected.' },
+    { label: 'Inactive', value: 'inactive', description: 'Sensor exists but is not currently operational or reporting.' },
+    { label: 'Online', value: 'online', description: 'Sensor is connected and sending live data via its parent device.' },
+    { label: 'Offline', value: 'offline', description: 'Sensor has stopped sending data or is unreachable.' },
+    { label: 'Calibrating', value: 'calibrating', description: 'Sensor undergoing calibration or self-test to ensure measurement accuracy.' },
+    { label: 'Faulty', value: 'faulty', description: 'Sensor hardware failure or inconsistent readings detected.' },
+    { label: 'Degraded', value: 'degraded', description: 'Sensor partially functional; data irregularities or unstable connection.' },
+    { label: 'Maintenance', value: 'maintenance', description: 'Sensor temporarily disabled for maintenance, cleaning, or recalibration.' },
+    { label: 'Error', value: 'error', description: 'Critical failure or unrecoverable error reported by sensor or gateway.' },
+    { label: 'Disconnected', value: 'disconnected', description: 'Sensor communication link lost with device or telematic gateway.' },
+    { label: 'Disabled', value: 'disabled', description: 'Sensor manually disabled; no data being collected.' },
+    { label: 'Decommissioned', value: 'decommissioned', description: 'Sensor permanently retired, replaced, or removed from service.' },
+];
+
 export default function fleetOpsOptions(key) {
     const allOptions = {
         driverTypes,
@@ -434,6 +523,12 @@ export default function fleetOpsOptions(key) {
         dimensionUnits,
         weightUnits,
         serviceAreaTypes,
+        telematicStatuses,
+        telematicHealthStates,
+        deviceTypes,
+        sensorTypes,
+        deviceStatuses,
+        sensorStatuses,
     };
 
     return allOptions[key] ?? [];

package/addon/utils/setup-customer-portal.js

@@ -4,6 +4,8 @@ import { setOwner } from '@ember/application';
 import { debug } from '@ember/debug';
 
 export default function setupCustomerPortal(app, engine, universe) {
+    if (!customerPortalInstalled(app)) return;
+
     universe.afterBoot(function (u) {
         const portal = u.getEngineInstance('@fleetbase/customer-portal-engine');
         if (!portal) {
@@ -58,3 +60,8 @@ function createEngineBoundComponent(engineInstance, ComponentClass) {
         }
     };
 }
+
+function customerPortalInstalled(app) {
+    const extensions = app.extensions ?? [];
+    return extensions.find(({ name }) => name === '@fleetbase/customer-portal-engine');
+}

package/app/components/device/panel-header.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/components/device/panel-header';

package/app/components/map/drawer/device-event-listing.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/components/map/drawer/device-event-listing';

package/app/components/map/drawer/position-listing.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/components/map/drawer/position-listing';

package/app/components/positions-replay.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/components/positions-replay';

package/app/components/sensor/panel-header.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/components/sensor/panel-header';

package/app/helpers/get-fleet-ops-option-label.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/helpers/get-fleet-ops-option-label';

package/app/routes/management/vehicles/index/details/positions.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/routes/management/vehicles/index/details/positions';

package/app/templates/management/vehicles/index/details/positions.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/templates/management/vehicles/index/details/positions';

package/composer.json

@@ -1,6 +1,6 @@
 {
     "name": "fleetbase/fleetops-api",
-    "version": "0.6.19",
+    "version": "0.6.21",
     "description": "Fleet & Transport Management Extension for Fleetbase",
     "keywords": [
         "fleetbase-extension",

package/extension.json

@@ -1,6 +1,6 @@
 {
     "name": "Fleet-Ops",
-    "version": "0.6.19",
+    "version": "0.6.21",
     "description": "Fleet & Transport Management Extension for Fleetbase",
     "repository": "https://github.com/fleetbase/fleetops",
     "license": "AGPL-3.0-or-later",

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@fleetbase/fleetops-engine",
-    "version": "0.6.19",
+    "version": "0.6.21",
     "description": "Fleet & Transport Management Extension for Fleetbase",
     "fleetbase": {
         "route": "fleet-ops"
@@ -42,9 +42,9 @@
     },
     "dependencies": {
         "@babel/core": "^7.23.2",
-        "@fleetbase/ember-core": "latest",
-        "@fleetbase/ember-ui": "latest",
-        "@fleetbase/fleetops-data": "^0.1.20",
+        "@fleetbase/ember-core": "^0.3.6",
+        "@fleetbase/ember-ui": "^0.3.7",
+        "@fleetbase/fleetops-data": "^0.1.21",
         "@fleetbase/leaflet-routing-machine": "^3.2.17",
         "@fortawesome/ember-fontawesome": "^2.0.0",
         "@fortawesome/fontawesome-svg-core": "6.4.0",

package/server/config/telematics.php

@@ -0,0 +1,111 @@
+<?php
+
+return [
+    'providers' => [
+        [
+            'key' => 'flespi',
+            'label' => 'Flespi',
+            'type' => 'native',
+            'driver_class' => \Fleetbase\FleetOps\Support\Telematics\Providers\FlespiProvider::class,
+            'icon' => 'https://flespi.com/favicon.ico',
+            'description' => 'Flespi is a robust telematics platform offering device management, data processing, and API integration.',
+            'docs_url' => 'https://flespi.com/docs',
+            'required_fields' => [
+                [
+                    'name' => 'token',
+                    'label' => 'Flespi Token',
+                    'type' => 'password',
+                    'placeholder' => 'Enter your Flespi API token',
+                    'required' => true,
+                    'validation' => 'required|string|min:20',
+                ],
+                [
+                    'name' => 'webhook_secret',
+                    'label' => 'Webhook Secret (Optional)',
+                    'type' => 'password',
+                    'placeholder' => 'Enter webhook secret for signature validation',
+                    'required' => false,
+                ],
+            ],
+            'supports_webhooks' => true,
+            'supports_discovery' => true,
+            'metadata' => [
+                'rate_limit' => 100,
+                'pagination' => 'offset',
+            ],
+        ],
+
+        [
+            'key' => 'geotab',
+            'label' => 'Geotab',
+            'type' => 'native',
+            'driver_class' => \Fleetbase\FleetOps\Support\Telematics\Providers\GeotabProvider::class,
+            'icon' => 'https://www.geotab.com/favicon.ico',
+            'description' => 'Geotab provides fleet management solutions with GPS tracking, driver safety, and compliance features.',
+            'docs_url' => 'https://developers.geotab.com/',
+            'required_fields' => [
+                [
+                    'name' => 'database',
+                    'label' => 'Database Name',
+                    'type' => 'text',
+                    'placeholder' => 'Enter your Geotab database name',
+                    'required' => true,
+                ],
+                [
+                    'name' => 'username',
+                    'label' => 'Username',
+                    'type' => 'text',
+                    'placeholder' => 'Enter your Geotab username',
+                    'required' => true,
+                ],
+                [
+                    'name' => 'password',
+                    'label' => 'Password',
+                    'type' => 'password',
+                    'placeholder' => 'Enter your Geotab password',
+                    'required' => true,
+                ],
+            ],
+            'supports_webhooks' => false,
+            'supports_discovery' => true,
+            'metadata' => [
+                'rate_limit' => 50,
+                'auth_type' => 'session',
+            ],
+        ],
+
+        [
+            'key' => 'samsara',
+            'label' => 'Samsara',
+            'type' => 'native',
+            'driver_class' => \Fleetbase\FleetOps\Support\Telematics\Providers\SamsaraProvider::class,
+            'icon' => 'https://www.samsara.com/favicon.ico',
+            'description' => 'Samsara offers IoT solutions for fleet operations, including GPS tracking, dashcams, and asset monitoring.',
+            'docs_url' => 'https://developers.samsara.com/',
+            'required_fields' => [
+                [
+                    'name' => 'api_token',
+                    'label' => 'API Token',
+                    'type' => 'password',
+                    'placeholder' => 'Enter your Samsara API token',
+                    'required' => true,
+                    'validation' => 'required|string|min:20',
+                ],
+                [
+                    'name' => 'webhook_secret',
+                    'label' => 'Webhook Secret (Optional)',
+                    'type' => 'password',
+                    'placeholder' => 'Enter webhook secret for signature validation',
+                    'required' => false,
+                ],
+            ],
+            'supports_webhooks' => true,
+            'supports_discovery' => true,
+            'metadata' => [
+                'rate_limit' => 60,
+                'pagination' => 'cursor',
+            ],
+        ],
+    ]
+];
+

package/server/migrations/2025_10_27_000001_add_telematics_integration_fields.php

@@ -0,0 +1,70 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration {
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        // Update telematics table
+        Schema::table('telematics', function (Blueprint $table) {
+            $table->json('credentials')->after('config');
+            $table->string('public_id')->after('uuid')->nullable()->index();
+        });
+
+        // Update devices table
+        Schema::table('devices', function (Blueprint $table) {
+            $table->string('public_id')->after('uuid')->nullable()->index();
+            $table->foreignUuid('company_uuid')->nullable()->after('_key')->constrained('companies', 'uuid')->nullOnDelete();
+            $table->foreignUuid('photo_uuid')->nullable()->after('telematic_uuid')->constrained('files', 'uuid')->nullOnDelete();
+        });
+
+        // Update sensors table
+        Schema::table('sensors', function (Blueprint $table) {
+            $table->string('public_id')->after('uuid')->nullable()->index();
+            $table->foreignUuid('photo_uuid')->nullable()->after('company_uuid')->constrained('files', 'uuid')->nullOnDelete();
+        });
+
+        // Update device events table
+        Schema::table('device_events', function (Blueprint $table) {
+            $table->string('public_id')->after('uuid')->nullable()->index();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        // Remove columns from telematics
+        Schema::table('telematics', function (Blueprint $table) {
+            $table->dropColumn(['credentials', 'public_id']);
+        });
+
+        // Remove columns from devices
+        Schema::table('devices', function (Blueprint $table) {
+            $table->dropForeign(['company_uuid']);
+            $table->dropForeign(['photo_uuid']);
+            $table->dropColumn(['public_id', 'photo_uuid', 'company_uuid']);
+        });
+
+        // Remove columns from sensors
+        Schema::table('sensors', function (Blueprint $table) {
+            $table->dropForeign(['photo_uuid']);
+            $table->dropColumn(['public_id', 'photo_uuid']);
+        });
+
+        // Remove columns from device events
+        Schema::table('device_events', function (Blueprint $table) {
+            $table->dropColumn(['public_id']);
+        });
+    }
+};

package/server/migrations/2025_10_27_171322_fix_device_column_names.php

@@ -0,0 +1,107 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration {
+    public function up(): void
+    {
+        /**
+         * Devices: rename columns WITHOUT doctrine/dbal (MySQL 8+).
+         */
+        DB::statement('ALTER TABLE devices RENAME COLUMN device_name TO name');
+        DB::statement('ALTER TABLE devices RENAME COLUMN device_type TO type');
+        DB::statement('ALTER TABLE devices RENAME COLUMN device_location TO location');
+        DB::statement('ALTER TABLE devices RENAME COLUMN device_model TO model');
+        DB::statement('ALTER TABLE devices RENAME COLUMN device_provider TO provider');
+
+        /**
+         * Devices: add new scalar cols + spatial POINT (nullable first!).
+         */
+        Schema::table('devices', function (Blueprint $table) {
+            $table->string('internal_id')->nullable()->after('device_id');
+            $table->string('imei')->nullable()->after('device_id');
+            $table->string('imsi')->nullable()->after('device_id');
+            $table->string('firmware_version')->nullable()->after('device_id');
+
+            // must be nullable now; we'll backfill and then make NOT NULL
+            $table->point('last_position')->nullable()->after('serial_number');
+        });
+
+        // Backfill existing rows so NOT NULL will succeed
+        DB::statement('UPDATE devices SET last_position = ST_SRID(POINT(0, 0), 4326) WHERE last_position IS NULL');
+
+        // Make column NOT NULL (and optionally enforce SRID at column level)
+        // If you want to enforce SRID on the column itself, uncomment the SRID variant:
+        // DB::statement('ALTER TABLE devices MODIFY last_position POINT NOT NULL SRID 4326');
+        DB::statement('ALTER TABLE devices MODIFY last_position POINT NOT NULL');
+
+        // NOW add the spatial index (requires NOT NULL)
+        Schema::table('devices', function (Blueprint $table) {
+            $table->spatialIndex('last_position', 'devices_last_position_spx');
+        });
+
+        /**
+         * Sensors: drop legacy column, add fields + POINT (nullable), backfill, NOT NULL, index.
+         */
+        Schema::table('sensors', function (Blueprint $table) {
+            if (Schema::hasColumn('sensors', 'sensor_type')) {
+                $table->dropColumn('sensor_type');
+            }
+
+            $table->foreignUuid('telematic_uuid')->nullable()->after('company_uuid')->constrained('telematics', 'uuid')->nullOnDelete();
+            $table->string('firmware_version')->nullable()->after('name');
+            $table->string('imei')->nullable()->after('name');
+            $table->string('imsi')->nullable()->after('name');
+            $table->string('serial_number')->nullable()->after('name');
+            $table->string('internal_id')->nullable()->after('name');
+            $table->string('status')->nullable()->after('last_value');
+
+            $table->point('last_position')->nullable()->after('serial_number');
+        });
+
+        DB::statement('UPDATE sensors SET last_position = ST_SRID(POINT(0, 0), 4326) WHERE last_position IS NULL');
+        DB::statement('ALTER TABLE sensors MODIFY last_position POINT NOT NULL');
+
+        Schema::table('sensors', function (Blueprint $table) {
+            $table->spatialIndex('last_position', 'sensors_last_position_spx');
+        });
+    }
+
+    public function down(): void
+    {
+        /**
+         * Devices: drop spatial index then column, drop added scalars, rename back.
+         */
+        Schema::table('devices', function (Blueprint $table) {
+            // drop index BEFORE dropping column
+            $table->dropSpatialIndex('devices_last_position_spx');
+            $table->dropColumn('last_position');
+
+            $table->dropColumn(['internal_id', 'imei', 'imsi', 'firmware_version']);
+        });
+
+        DB::statement('ALTER TABLE devices RENAME COLUMN name TO device_name');
+        DB::statement('ALTER TABLE devices RENAME COLUMN type TO device_type');
+        DB::statement('ALTER TABLE devices RENAME COLUMN location TO device_location');
+        DB::statement('ALTER TABLE devices RENAME COLUMN model TO device_model');
+        DB::statement('ALTER TABLE devices RENAME COLUMN provider TO device_provider');
+
+        /**
+         * Sensors: drop spatial index/column, drop new fields, restore sensor_type.
+         */
+        Schema::table('sensors', function (Blueprint $table) {
+            $table->dropSpatialIndex('sensors_last_position_spx');
+            $table->dropColumn('last_position');
+
+            $table->dropForeign(['telematic_uuid']);
+            $table->dropColumn(['telematic_uuid']);
+
+            $table->dropColumn(['serial_number', 'internal_id', 'imei', 'imsi', 'firmware_version', 'status']);
+
+            $table->string('sensor_type')->nullable()->after('slug');
+        });
+    }
+};

package/server/migrations/2025_10_27_203023_add_company_uuid_to_device_events_table.php

@@ -0,0 +1,28 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration {
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('device_events', function (Blueprint $table) {
+            $table->foreignUuid('company_uuid')->nullable()->after('_key')->constrained('companies', 'uuid')->nullOnDelete();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('device_events', function (Blueprint $table) {
+            $table->dropForeign(['company_uuid']);
+            $table->dropColumn(['company_uuid']);
+        });
+    }
+};