fix(web): clarify act context and operational map

api-v3/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "dhv2-api",
-  "version": "0.29.0-14",
+  "version": "0.29.0-15",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "dhv2-api",
-      "version": "0.29.0-14",
+      "version": "0.29.0-15",
       "license": "UNLICENSED",
       "dependencies": {
         "@nestjs/common": "^11.0.0",

api-v3/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dhv2-api",
-  "version": "0.29.0-14",
+  "version": "0.29.0-15",
   "private": true,
   "license": "UNLICENSED",
   "scripts": {

api-v3/src/asset-master/asset-geometries.controller.ts

@@ -63,3 +63,25 @@ export class MapAssetsController {
     return this.geometries.map(query);
   }
 }
+
+@Controller('map/context')
+export class MapOperationalContextController {
+  constructor(private readonly geometries: AssetGeometriesService) {}
+
+  @Get()
+  @RequirePermissions('assets.read')
+  map() {
+    return this.geometries.mapOperationalContext();
+  }
+}
+
+@Controller('map/documents')
+export class MapDocumentsController {
+  constructor(private readonly geometries: AssetGeometriesService) {}
+
+  @Get()
+  @RequirePermissions('assets.read', 'inspection_acts.read', 'inspection_findings.read')
+  map() {
+    return this.geometries.mapDocuments();
+  }
+}

api-v3/src/asset-master/asset-geometries.service.ts

@@ -230,6 +230,8 @@ export class AssetGeometriesService {
         geometry: row.geometry,
         properties: {
           id: row.id,
+          entityId: row.id,
+          entityKind: 'ASSET',
           code: row.code,
           name: row.name,
           typeId: row.typeId,
@@ -242,12 +244,230 @@ export class AssetGeometriesService {
           accuracyM: row.accuracyM == null ? null : Number(row.accuracyM),
           capturedAt: row.capturedAt,
           updatedAt: row.updatedAt,
+          href: `/inventarios/${row.id}`,
+          contextLine: row.parentName ? `Depende de ${row.parentName}` : null,
         },
       })),
       meta: { count: visible.length, truncated },
     };
   }
 
+  async mapOperationalContext() {
+    const rows = (await this.dataSource.query(`
+      WITH RECURSIVE y_tree AS (
+        SELECT y.id AS yacimiento_id, y.id AS asset_id
+        FROM assets y
+        INNER JOIN asset_types y_type ON y_type.id=y.asset_type_id
+        WHERE lower(y_type.code)='yacimiento'
+          AND y_type.is_active=true
+          AND y.information_status<>'INACTIVE'
+        UNION ALL
+        SELECT tree.yacimiento_id, child.id
+        FROM y_tree tree
+        INNER JOIN assets child ON child.parent_id=tree.asset_id
+        WHERE child.information_status<>'INACTIVE'
+      ), y_loc AS (
+        SELECT tree.yacimiento_id,
+          ST_Centroid(ST_Collect(geometry.geometry)) AS geometry,
+          MAX(geometry.updated_at) AS updated_at,
+          COUNT(*)::integer AS source_geometries
+        FROM y_tree tree
+        INNER JOIN asset_geometries geometry ON geometry.asset_id=tree.asset_id
+        GROUP BY tree.yacimiento_id
+      ), base AS (
+        SELECT
+          y.id AS yacimiento_id,y.code AS yacimiento_code,y.name AS yacimiento_name,
+          y.information_status AS yacimiento_status,
+          area.id AS area_id,area.code AS area_code,area.name AS area_name,
+          department.id AS department_id,department.code AS department_code,department.name AS department_name,
+          company.id AS company_id,company.code AS company_code,COALESCE(profile.legal_name,company.name) AS company_name,
+          loc.geometry,loc.updated_at,loc.source_geometries
+        FROM y_loc loc
+        INNER JOIN assets y ON y.id=loc.yacimiento_id
+        LEFT JOIN assets area ON area.id=y.parent_id
+        LEFT JOIN assets department ON department.id=area.parent_id
+        LEFT JOIN assets company ON company.id=y.operator_company_id
+        LEFT JOIN organization_profiles profile ON profile.asset_id=company.id
+      )
+      SELECT
+        'YACIMIENTO:'||base.yacimiento_id::text AS "featureId",
+        base.yacimiento_id AS "entityId",'YACIMIENTO'::text AS "entityKind",
+        ST_AsGeoJSON(base.geometry)::jsonb AS geometry,
+        base.yacimiento_code AS code,base.yacimiento_name AS name,
+        'Yacimiento'::text AS "typeName",base.yacimiento_status::text AS "informationStatus",
+        'POINT'::text AS "geometryType",base.updated_at AS "updatedAt",
+        '/inventarios/'||base.yacimiento_id::text AS href,
+        concat_ws(' · ',base.department_name,base.area_name,base.company_name) AS "contextLine",
+        base.department_name AS "departmentName",base.area_name AS "areaName",
+        base.yacimiento_name AS "yacimientoName",base.company_name AS "companyName",
+        base.source_geometries AS "sourceGeometries"
+      FROM base
+      UNION ALL
+      SELECT
+        'COMPANY:'||base.company_id::text||':'||base.yacimiento_id::text AS "featureId",
+        base.company_id AS "entityId",'COMPANY'::text AS "entityKind",
+        ST_AsGeoJSON(base.geometry)::jsonb AS geometry,
+        base.company_code AS code,base.company_name AS name,
+        'Empresa operadora'::text AS "typeName",'ACTIVE'::text AS "informationStatus",
+        'POINT'::text AS "geometryType",base.updated_at AS "updatedAt",
+        '/inventarios/'||base.company_id::text AS href,
+        concat_ws(' · ','Yacimiento '||base.yacimiento_name,'Área '||base.area_name,base.department_name) AS "contextLine",
+        base.department_name AS "departmentName",base.area_name AS "areaName",
+        base.yacimiento_name AS "yacimientoName",base.company_name AS "companyName",
+        base.source_geometries AS "sourceGeometries"
+      FROM base
+      WHERE base.company_id IS NOT NULL
+      ORDER BY "entityKind","name","code"
+    `)) as Array<Record<string, unknown>>;
+    return {
+      type: 'FeatureCollection' as const,
+      features: rows.map((row) => ({
+        type: 'Feature' as const,
+        id: row.featureId,
+        geometry: row.geometry,
+        properties: {
+          id: row.featureId,
+          entityId: row.entityId,
+          entityKind: row.entityKind,
+          code: row.code,
+          name: row.name,
+          typeName: row.typeName,
+          informationStatus: row.informationStatus,
+          geometryType: row.geometryType,
+          updatedAt: row.updatedAt,
+          href: row.href,
+          contextLine: row.contextLine,
+          departmentName: row.departmentName,
+          areaName: row.areaName,
+          yacimientoName: row.yacimientoName,
+          companyName: row.companyName,
+          sourceGeometries: row.sourceGeometries,
+        },
+      })),
+      meta: { count: rows.length, truncated: false },
+    };
+  }
+
+  async mapDocuments() {
+    const rows = (await this.dataSource.query(`
+      WITH RECURSIVE y_tree AS (
+        SELECT y.id AS yacimiento_id, y.id AS asset_id
+        FROM assets y
+        INNER JOIN asset_types y_type ON y_type.id=y.asset_type_id
+        WHERE lower(y_type.code)='yacimiento'
+          AND y_type.is_active=true
+          AND y.information_status<>'INACTIVE'
+        UNION ALL
+        SELECT tree.yacimiento_id, child.id
+        FROM y_tree tree
+        INNER JOIN assets child ON child.parent_id=tree.asset_id
+        WHERE child.information_status<>'INACTIVE'
+      ), y_loc AS (
+        SELECT tree.yacimiento_id,
+          ST_Centroid(ST_Collect(geometry.geometry)) AS geometry,
+          MAX(geometry.updated_at) AS updated_at
+        FROM y_tree tree
+        INNER JOIN asset_geometries geometry ON geometry.asset_id=tree.asset_id
+        GROUP BY tree.yacimiento_id
+      ), finding_rows AS (
+        SELECT
+          finding.id,finding.code,finding.title,finding.status,finding.asset_id,
+          act.id AS act_id,act.code AS act_code,act.occurred_at,
+          visit.id AS visit_id,visit.code AS visit_code,
+          target.code AS asset_code,target.name AS asset_name,
+          target_geometry.geometry AS target_geometry,
+          tree.yacimiento_id,
+          y.name AS yacimiento_name,area.name AS area_name,department.name AS department_name,
+          COALESCE(profile.legal_name,company.name) AS company_name,
+          loc.geometry AS fallback_geometry,COALESCE(target_geometry.updated_at,loc.updated_at) AS updated_at
+        FROM inspection_findings finding
+        INNER JOIN inspection_acts act ON act.id=finding.act_id
+        INNER JOIN inspection_visits visit ON visit.id=act.visit_id
+        INNER JOIN assets target ON target.id=finding.asset_id
+        LEFT JOIN asset_geometries target_geometry ON target_geometry.asset_id=target.id
+        LEFT JOIN y_tree tree ON tree.asset_id=target.id
+        LEFT JOIN assets y ON y.id=tree.yacimiento_id
+        LEFT JOIN assets area ON area.id=y.parent_id
+        LEFT JOIN assets department ON department.id=area.parent_id
+        LEFT JOIN assets company ON company.id=y.operator_company_id
+        LEFT JOIN organization_profiles profile ON profile.asset_id=company.id
+        LEFT JOIN y_loc loc ON loc.yacimiento_id=tree.yacimiento_id
+        WHERE finding.status<>'VOIDED'
+      ), act_yacimiento AS (
+        SELECT act.id AS act_id,
+          COALESCE(
+            CASE WHEN lower(COALESCE(scope_type.code,''))='yacimiento' THEN scope.id END,
+            (SELECT fr.yacimiento_id FROM finding_rows fr WHERE fr.act_id=act.id AND fr.yacimiento_id IS NOT NULL ORDER BY fr.id LIMIT 1)
+          ) AS yacimiento_id
+        FROM inspection_acts act
+        INNER JOIN inspection_visits visit ON visit.id=act.visit_id
+        LEFT JOIN assets scope ON scope.id=visit.scope_asset_id
+        LEFT JOIN asset_types scope_type ON scope_type.id=scope.asset_type_id
+        WHERE act.status<>'CANCELLED'
+      )
+      SELECT
+        'FINDING:'||finding.id::text AS "featureId",finding.id AS "entityId",'FINDING'::text AS "entityKind",
+        ST_AsGeoJSON(ST_Centroid(COALESCE(finding.target_geometry,finding.fallback_geometry)))::jsonb AS geometry,
+        finding.code,finding.title AS name,'Hallazgo'::text AS "typeName",finding.status::text AS "informationStatus",
+        'POINT'::text AS "geometryType",finding.updated_at AS "updatedAt",
+        '/hallazgos/'||finding.id::text AS href,
+        concat_ws(' · ',finding.act_code,finding.asset_name,finding.yacimiento_name,finding.company_name) AS "contextLine",
+        finding.department_name AS "departmentName",finding.area_name AS "areaName",
+        finding.yacimiento_name AS "yacimientoName",finding.company_name AS "companyName",
+        finding.act_code AS "actCode",finding.asset_name AS "assetName"
+      FROM finding_rows finding
+      WHERE COALESCE(finding.target_geometry,finding.fallback_geometry) IS NOT NULL
+      UNION ALL
+      SELECT
+        'ACT:'||act.id::text AS "featureId",act.id AS "entityId",'ACT'::text AS "entityKind",
+        ST_AsGeoJSON(loc.geometry)::jsonb AS geometry,
+        act.code,act.title AS name,'Acta'::text AS "typeName",act.status::text AS "informationStatus",
+        'POINT'::text AS "geometryType",COALESCE(loc.updated_at,act.updated_at) AS "updatedAt",
+        '/inspecciones/actas/'||act.id::text AS href,
+        concat_ws(' · ',y.name,area.name,COALESCE(profile.legal_name,company.name)) AS "contextLine",
+        department.name AS "departmentName",area.name AS "areaName",y.name AS "yacimientoName",
+        COALESCE(profile.legal_name,company.name) AS "companyName",act.code AS "actCode",NULL::text AS "assetName"
+      FROM inspection_acts act
+      INNER JOIN act_yacimiento ay ON ay.act_id=act.id
+      INNER JOIN y_loc loc ON loc.yacimiento_id=ay.yacimiento_id
+      INNER JOIN assets y ON y.id=ay.yacimiento_id
+      LEFT JOIN assets area ON area.id=y.parent_id
+      LEFT JOIN assets department ON department.id=area.parent_id
+      LEFT JOIN assets company ON company.id=y.operator_company_id
+      LEFT JOIN organization_profiles profile ON profile.asset_id=company.id
+      WHERE act.status<>'CANCELLED'
+      ORDER BY "entityKind","code"
+    `)) as Array<Record<string, unknown>>;
+    return {
+      type: 'FeatureCollection' as const,
+      features: rows.map((row) => ({
+        type: 'Feature' as const,
+        id: row.featureId,
+        geometry: row.geometry,
+        properties: {
+          id: row.featureId,
+          entityId: row.entityId,
+          entityKind: row.entityKind,
+          code: row.code,
+          name: row.name,
+          typeName: row.typeName,
+          informationStatus: row.informationStatus,
+          geometryType: row.geometryType,
+          updatedAt: row.updatedAt,
+          href: row.href,
+          contextLine: row.contextLine,
+          departmentName: row.departmentName,
+          areaName: row.areaName,
+          yacimientoName: row.yacimientoName,
+          companyName: row.companyName,
+          actCode: row.actCode,
+          assetName: row.assetName,
+        },
+      })),
+      meta: { count: rows.length, truncated: false },
+    };
+  }
+
   private async requireAsset(
     manager: EntityManager,
     id: string,

api-v3/src/asset-master/asset-master.module.ts

@@ -7,6 +7,8 @@ import { AssetsService } from './assets.service';
 import {
   AssetGeometriesController,
   MapAssetsController,
+  MapDocumentsController,
+  MapOperationalContextController,
 } from './asset-geometries.controller';
 import { AssetGeometriesService } from './asset-geometries.service';
 import { AssetHistoryController } from './asset-history.controller';
@@ -50,6 +52,8 @@ import { InventoryBrowserService } from './inventory-browser.service';
     FieldInventoryMergeController,
     AssetGeometriesController,
     MapAssetsController,
+    MapOperationalContextController,
+    MapDocumentsController,
     AssetHistoryController,
     AssetMediaController,
     AssetProvenanceController,

api-v3/src/inspection-acts/inspection-acts.service.ts

@@ -59,9 +59,22 @@ interface ActReportSummary {
   code: string;
   status: string;
   pdfStatus: string;
+  wordStatus: string;
+  gedoIfIdentifier: string | null;
+  gedoOfficializedAt: Date | null;
   generatedAt: Date;
 }
 
+interface ActTerritorialContext {
+  department: ActContextAsset | null;
+  area: ActContextAsset | null;
+  yacimiento: ActContextAsset | null;
+  company: ActContextAsset | null;
+  installations: ActContextAsset[];
+  subinstallations: ActContextAsset[];
+  legacyAreaScope: boolean;
+}
+
 export interface InspectionActListItem {
   id: string;
   visitId: string;
@@ -94,6 +107,7 @@ export interface InspectionActListItem {
   findingCount: number;
   companies: ActContextAsset[];
   areas: ActContextAsset[];
+  context: ActTerritorialContext;
   report: ActReportSummary | null;
   createdBy: ActPerson | null;
   updatedBy: ActPerson | null;
@@ -547,11 +561,23 @@ export class InspectionActsService {
         COALESCE(finding_count.total, 0)::integer AS "findingCount",
         COALESCE(context.companies, '[]'::jsonb) AS companies,
         COALESCE(context.areas, '[]'::jsonb) AS areas,
+        JSONB_BUILD_OBJECT(
+          'department', context.department,
+          'area', context.area,
+          'yacimiento', context.yacimiento,
+          'company', context.company,
+          'installations', COALESCE(context.installations, '[]'::jsonb),
+          'subinstallations', COALESCE(context.subinstallations, '[]'::jsonb),
+          'legacyAreaScope', context.legacy_area_scope
+        ) AS context,
         CASE WHEN report.id IS NULL THEN NULL ELSE JSONB_BUILD_OBJECT(
           'id', report.id,
           'code', report.code,
           'status', report.status,
           'pdfStatus', report.pdf_status,
+          'wordStatus', report.word_status,
+          'gedoIfIdentifier', report.gedo_if_identifier,
+          'gedoOfficializedAt', report.gedo_officialized_at,
           'generatedAt', report.generated_at
         ) END AS report,
         CASE WHEN creator.id IS NULL THEN NULL ELSE JSONB_BUILD_OBJECT(
@@ -580,10 +606,64 @@ export class InspectionActsService {
           ) END AS companies,
           CASE WHEN area.id IS NULL THEN '[]'::jsonb ELSE JSONB_BUILD_ARRAY(
             JSONB_BUILD_OBJECT('id',area.id,'code',area.code,'name',area.name)
-          ) END AS areas
+          ) END AS areas,
+          CASE WHEN department.id IS NULL THEN NULL ELSE JSONB_BUILD_OBJECT(
+            'id',department.id,'code',department.code,'name',department.name
+          ) END AS department,
+          CASE WHEN area.id IS NULL THEN NULL ELSE JSONB_BUILD_OBJECT(
+            'id',area.id,'code',area.code,'name',area.name
+          ) END AS area,
+          CASE WHEN yacimiento.id IS NULL THEN NULL ELSE JSONB_BUILD_OBJECT(
+            'id',yacimiento.id,'code',yacimiento.code,'name',yacimiento.name
+          ) END AS yacimiento,
+          CASE WHEN company.id IS NULL THEN NULL ELSE JSONB_BUILD_OBJECT(
+            'id',company.id,'code',company.code,'name',company.name
+          ) END AS company,
+          COALESCE(affected.installations, '[]'::jsonb) AS installations,
+          COALESCE(affected.subinstallations, '[]'::jsonb) AS subinstallations,
+          (lower(COALESCE(scope_type.code,''))='area') AS legacy_area_scope
         FROM inspection_visits context_visit
         LEFT JOIN assets company ON company.id=context_visit.operator_company_id
         LEFT JOIN assets area ON area.id=context_visit.operational_area_id
+        LEFT JOIN assets department ON department.id=area.parent_id
+        LEFT JOIN assets scope_asset ON scope_asset.id=context_visit.scope_asset_id
+        LEFT JOIN asset_types scope_type ON scope_type.id=scope_asset.asset_type_id
+        LEFT JOIN assets yacimiento ON yacimiento.id=CASE
+          WHEN lower(COALESCE(scope_type.code,''))='yacimiento' THEN scope_asset.id
+          ELSE NULL
+        END
+        LEFT JOIN LATERAL (
+          SELECT
+            COALESCE((
+              SELECT JSONB_AGG(JSONB_BUILD_OBJECT('id',x.id,'code',x.code,'name',x.name) ORDER BY x.name,x.code)
+              FROM (
+                SELECT DISTINCT installation.id, installation.code, installation.name
+                FROM inspection_findings finding_context
+                INNER JOIN assets finding_asset ON finding_asset.id=finding_context.asset_id
+                INNER JOIN asset_types finding_type ON finding_type.id=finding_asset.asset_type_id
+                LEFT JOIN assets installation ON installation.id=CASE
+                  WHEN lower(finding_type.code)='instalacion' THEN finding_asset.id
+                  WHEN lower(finding_type.code)='subinstalacion' THEN finding_asset.parent_id
+                  ELSE NULL
+                END
+                WHERE finding_context.act_id=act.id
+                  AND finding_context.status<>'VOIDED'
+                  AND installation.id IS NOT NULL
+              ) x
+            ), '[]'::jsonb) AS installations,
+            COALESCE((
+              SELECT JSONB_AGG(JSONB_BUILD_OBJECT('id',x.id,'code',x.code,'name',x.name) ORDER BY x.name,x.code)
+              FROM (
+                SELECT DISTINCT finding_asset.id, finding_asset.code, finding_asset.name
+                FROM inspection_findings finding_context
+                INNER JOIN assets finding_asset ON finding_asset.id=finding_context.asset_id
+                INNER JOIN asset_types finding_type ON finding_type.id=finding_asset.asset_type_id
+                WHERE finding_context.act_id=act.id
+                  AND finding_context.status<>'VOIDED'
+                  AND lower(finding_type.code)='subinstalacion'
+              ) x
+            ), '[]'::jsonb) AS subinstallations
+        ) affected ON true
         WHERE context_visit.id=act.visit_id
       ) context ON true
       LEFT JOIN LATERAL (

api-v3/src/inspection-findings/inspection-findings.service.ts

@@ -41,9 +41,18 @@ interface FindingAssetView {
   code: string;
   name: string;
   commonName: string | null;
+  typeCode: string;
   typeName: string;
   operatorCompany: FindingContextView | null;
   operationalArea: FindingContextView | null;
+  hierarchy: {
+    department: FindingContextView | null;
+    area: FindingContextView | null;
+    yacimiento: FindingContextView | null;
+    installation: FindingContextView | null;
+    subinstallation: FindingContextView | null;
+    company: FindingContextView | null;
+  };
 }
 
 type FindingCatalogView = {
@@ -809,13 +818,34 @@ export class InspectionFindingsService {
           'code', asset.code,
           'name', asset.name,
           'commonName', asset.common_name,
+          'typeCode', asset_type.code,
           'typeName', asset_type.name,
           'operatorCompany', CASE WHEN company.id IS NULL THEN NULL ELSE JSONB_BUILD_OBJECT(
             'id', company.id, 'code', company.code, 'name', company.name
           ) END,
           'operationalArea', CASE WHEN area.id IS NULL THEN NULL ELSE JSONB_BUILD_OBJECT(
             'id', area.id, 'code', area.code, 'name', area.name
-          ) END
+          ) END,
+          'hierarchy', JSONB_BUILD_OBJECT(
+            'department', CASE WHEN department.id IS NULL THEN NULL ELSE JSONB_BUILD_OBJECT(
+              'id',department.id,'code',department.code,'name',department.name
+            ) END,
+            'area', CASE WHEN area.id IS NULL THEN NULL ELSE JSONB_BUILD_OBJECT(
+              'id',area.id,'code',area.code,'name',area.name
+            ) END,
+            'yacimiento', CASE WHEN yacimiento.id IS NULL THEN NULL ELSE JSONB_BUILD_OBJECT(
+              'id',yacimiento.id,'code',yacimiento.code,'name',yacimiento.name
+            ) END,
+            'installation', CASE WHEN installation.id IS NULL THEN NULL ELSE JSONB_BUILD_OBJECT(
+              'id',installation.id,'code',installation.code,'name',installation.name
+            ) END,
+            'subinstallation', CASE WHEN subinstallation.id IS NULL THEN NULL ELSE JSONB_BUILD_OBJECT(
+              'id',subinstallation.id,'code',subinstallation.code,'name',subinstallation.name
+            ) END,
+            'company', CASE WHEN company.id IS NULL THEN NULL ELSE JSONB_BUILD_OBJECT(
+              'id',company.id,'code',company.code,'name',company.name
+            ) END
+          )
         ) AS asset,
         CASE WHEN catalog.id IS NULL THEN NULL ELSE JSONB_BUILD_OBJECT(
           'id', catalog.id,
@@ -861,6 +891,24 @@ export class InspectionFindingsService {
       INNER JOIN asset_types asset_type ON asset_type.id = asset.asset_type_id
       LEFT JOIN assets company ON company.id = asset.operator_company_id
       LEFT JOIN assets area ON area.id = asset.operational_area_id
+      LEFT JOIN assets department ON department.id = area.parent_id
+      LEFT JOIN assets parent_asset ON parent_asset.id = asset.parent_id
+      LEFT JOIN assets grandparent_asset ON grandparent_asset.id = parent_asset.parent_id
+      LEFT JOIN assets yacimiento ON yacimiento.id = CASE
+        WHEN lower(asset_type.code)='yacimiento' THEN asset.id
+        WHEN lower(asset_type.code)='instalacion' THEN parent_asset.id
+        WHEN lower(asset_type.code)='subinstalacion' THEN grandparent_asset.id
+        ELSE NULL
+      END
+      LEFT JOIN assets installation ON installation.id = CASE
+        WHEN lower(asset_type.code)='instalacion' THEN asset.id
+        WHEN lower(asset_type.code)='subinstalacion' THEN parent_asset.id
+        ELSE NULL
+      END
+      LEFT JOIN assets subinstallation ON subinstallation.id = CASE
+        WHEN lower(asset_type.code)='subinstalacion' THEN asset.id
+        ELSE NULL
+      END
       LEFT JOIN finding_catalog_items catalog ON catalog.id = finding.catalog_item_id
       LEFT JOIN finding_categories category ON category.id = catalog.category_id
       LEFT JOIN LATERAL (

api-v3/src/version.ts

@@ -1,2 +1,2 @@
-export const API_VERSION = '0.29.0-14';
-export const API_PHASE = 'F6.14';
+export const API_VERSION = '0.29.0-15';
+export const API_PHASE = 'F6.15';

api-v3/test/unit/f4-health-metadata.test.ts

@@ -4,9 +4,9 @@ import { readFileSync } from 'node:fs';
 import { resolve } from 'node:path';
 import { API_PHASE, API_VERSION } from '../../src/version';
 
-test('health metadata reports the current F6.14 release', () => {
-  assert.equal(API_PHASE, 'F6.14');
+test('health metadata reports the current F6.15 release', () => {
+  assert.equal(API_PHASE, 'F6.15');
   const pkg = JSON.parse(readFileSync(resolve(process.cwd(), 'package.json'), 'utf8')) as { version: string };
   assert.equal(API_VERSION, pkg.version);
-  assert.equal(API_VERSION, '0.29.0-14');
+  assert.equal(API_VERSION, '0.29.0-15');
 });

api-v3/test/unit/f6-1-presentation-ready-contract.test.ts

@@ -13,7 +13,7 @@ test('F6.1 presentation metadata keeps the visible WEB version aligned with pack
   const visibleVersion = version.match(/APP_VERSION\s*=\s*'([^']+)'/)?.[1];
 
   assert.equal(visibleVersion, pkg.version);
-  assert.match(version, /APP_PHASE\s*=\s*'F6\.13/);
+  assert.match(version, /APP_PHASE\s*=\s*'F6\.15/);
 });
 
 test('F6.1 presentation keeps Relevamientos retired from WEB navigation and routes', () => {

api-v3/test/unit/f6-15-act-map-context.test.ts

@@ -0,0 +1,60 @@
+import assert from 'node:assert/strict';
+import { readFileSync } from 'node:fs';
+import { resolve } from 'node:path';
+import test from 'node:test';
+
+function api(path: string) { return readFileSync(resolve(process.cwd(), path), 'utf8'); }
+function web(path: string) { return readFileSync(resolve(process.cwd(), `../web-v2/src/${path}`), 'utf8'); }
+
+test('F6.15 Acta exposes full territorial and affected-inventory context', () => {
+  const acts = api('src/inspection-acts/inspection-acts.service.ts');
+  const findings = api('src/inspection-findings/inspection-findings.service.ts');
+  const page = web('pages/InspectionActEditorPage.tsx');
+  const media = web('features/inspections/InspectionActMediaPanel.tsx');
+  for (const field of ['department', 'area', 'yacimiento', 'company', 'installations', 'subinstallations']) {
+    assert.match(acts, new RegExp(`'${field}'`));
+  }
+  assert.match(acts, /legacyAreaScope/);
+  assert.match(findings, /'hierarchy'/);
+  assert.match(findings, /'installation'/);
+  assert.match(findings, /'subinstallation'/);
+  assert.match(page, /Ubicación territorial y operativa/);
+  assert.match(page, /No definido en la Inspección histórica/);
+  assert.match(media, /Elemento afectado:/);
+  assert.match(media, /Constatación:/);
+});
+
+test('F6.15 Acta uses real report workflow state instead of legacy generated PDF status', () => {
+  const acts = api('src/inspection-acts/inspection-acts.service.ts');
+  const page = web('pages/InspectionActEditorPage.tsx');
+  const list = web('pages/ActsPage.tsx');
+  assert.match(acts, /'gedoIfIdentifier'/);
+  assert.match(acts, /'gedoOfficializedAt'/);
+  assert.match(acts, /'wordStatus'/);
+  assert.match(page, /act\.report\.status === 'OFFICIALIZED'/);
+  assert.match(page, /Oficializado en GEDO/);
+  assert.doesNotMatch(page, /act\.report\.pdfStatus === 'READY'/);
+  assert.match(list, /act\.report\.status === 'OFFICIALIZED'/);
+});
+
+test('F6.15 map exposes filtered operational layers without inventing coordinates', () => {
+  const controller = api('src/asset-master/asset-geometries.controller.ts');
+  const service = api('src/asset-master/asset-geometries.service.ts');
+  const page = web('pages/MapPage.tsx');
+  const map = web('features/map/DhMap.tsx');
+  assert.match(controller, /@Controller\('map\/context'\)/);
+  assert.match(controller, /@Controller\('map\/documents'\)/);
+  assert.match(service, /WITH RECURSIVE y_tree/);
+  assert.match(service, /ST_Centroid\(ST_Collect\(geometry\.geometry\)\)/);
+  assert.match(service, /COALESCE\(finding\.target_geometry,finding\.fallback_geometry\)/);
+  for (const kind of ['YACIMIENTO', 'COMPANY', 'ACT', 'FINDING']) {
+    assert.match(service, new RegExp(`'${kind}'::text`));
+    assert.match(page, new RegExp(`${kind}:`));
+  }
+  assert.match(page, /Buscar Yacimiento, Empresa, Acta, Hallazgo/);
+  assert.match(page, /sourceGeometries/);
+  assert.match(map, /yacimiento-points/);
+  assert.match(map, /company-points/);
+  assert.match(map, /act-points/);
+  assert.match(map, /finding-points/);
+});

docs/PHASE_F6_15_WEB_ACT_MAP.md

@@ -0,0 +1,23 @@
+# F6.15 · Contexto documental y mapa operativo
+
+## Actas
+
+- El detalle de Acta expone Departamento, Área, Yacimiento y Empresa/Operadora.
+- Las Instalaciones y Subinstalaciones mostradas son únicamente las que tienen Hallazgos en esa Acta.
+- Cada Hallazgo explica el elemento afectado y su ruta territorial/técnica completa.
+- Las Inspecciones históricas cuyo alcance quedó guardado como Área se identifican como tales; el sistema no inventa un Yacimiento.
+
+## Informe relacionado
+
+- El estado visible del Informe se obtiene del workflow documental real.
+- `OFFICIALIZED` se presenta como oficializado en GEDO y muestra el identificador IF cuando existe.
+- `wordStatus=READY` indica que el INF está listo para remitir a GEDO; `pdfStatus` ya no determina si el Informe está "en preparación".
+
+## Mapa
+
+- Capas independientes: Inventario GPS, Yacimientos, Empresas, Actas y Hallazgos.
+- Incluye buscador transversal y conserva filtros de Inventario por tipo, estado y geometría.
+- Un Yacimiento sin geometría propia sólo se ubica cuando alguna Instalación/Subinstalación descendiente tiene geometría real; se utiliza el centroide de las geometrías registradas.
+- La Empresa se representa como presencia operativa en el Yacimiento que opera, no como una sede inventada.
+- Hallazgos usan la geometría exacta del elemento afectado cuando existe y, como respaldo, la ubicación derivada del Yacimiento.
+- Actas usan la ubicación derivada de su Yacimiento. Los registros sin referencia geográfica real no se dibujan.

web-v2/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "dhv2-web",
-  "version": "0.23.0-10",
+  "version": "0.23.0-11",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "dhv2-web",
-      "version": "0.23.0-10",
+      "version": "0.23.0-11",
       "dependencies": {
         "maplibre-gl": "6.4.1",
         "react": "^19.0.0",

web-v2/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dhv2-web",
-  "version": "0.23.0-10",
+  "version": "0.23.0-11",
   "private": true,
   "type": "module",
   "engines": {

web-v2/src/config/version.ts

@@ -1,2 +1,2 @@
-export const APP_VERSION = '0.23.0-10';
-export const APP_PHASE = 'F6.13 · Mapa operativo';
+export const APP_VERSION = '0.23.0-11';
+export const APP_PHASE = 'F6.15 · Actas y mapa operativo';

web-v2/src/features/inspections/InspectionActMediaPanel.tsx

@@ -30,9 +30,18 @@ function Photo({ id, title, caption, load }: { id: string; title: string; captio
 
 function Finding({ item }: { item: FindingWithPhotos }) {
   const { finding, photos } = item;
+  const hierarchy = finding.asset.hierarchy;
   return <article className="act-finding-record">
-    <div className="inspection-finding-heading"><div><span className="eyebrow">{finding.code}</span><h3>{finding.title}</h3><p>{finding.asset.name} · {finding.asset.code}</p></div></div>
-    <p className="inspection-finding-description">{finding.description}</p>
+    <div className="inspection-finding-heading"><div><span className="eyebrow">{finding.code}</span><h3>{finding.title}</h3><p><strong>Elemento afectado:</strong> {finding.asset.typeName} · {finding.asset.name} · {finding.asset.code}</p></div></div>
+    {hierarchy && <div className="responsible-summary act-finding-context">
+      <div><small>Departamento</small><strong>{hierarchy.department?.name ?? '—'}</strong></div>
+      <div><small>Área</small><strong>{hierarchy.area?.name ?? '—'}</strong></div>
+      <div><small>Yacimiento</small><strong>{hierarchy.yacimiento?.name ?? '—'}</strong></div>
+      <div><small>Empresa</small><strong>{hierarchy.company?.name ?? '—'}</strong></div>
+      <div><small>Instalación</small><strong>{hierarchy.installation?.name ?? 'No corresponde'}</strong></div>
+      <div><small>Subinstalación</small><strong>{hierarchy.subinstallation?.name ?? 'No corresponde'}</strong></div>
+    </div>}
+    <p className="inspection-finding-description"><strong>Constatación:</strong> {finding.description}</p>
     {finding.legalBasis && <p><strong>Normativa:</strong> {finding.legalBasis}</p>}
     {finding.severity != null && <p>Gravedad {finding.severity}/10</p>}
     {photos.length > 0 && <div className="act-finding-photos">

web-v2/src/features/map/DhMap.tsx

@@ -20,7 +20,7 @@ const osmStyle = {
   layers: [{ id: 'osm', type: 'raster' as const, source: 'osm' }],
 };
 
-const interactiveLayers = ['assets-points', 'assets-lines', 'assets-polygons'];
+const interactiveLayers = ['assets-points', 'yacimiento-points', 'company-points', 'act-points', 'finding-points', 'assets-lines', 'assets-polygons'];
 
 function boundsFromFeatures(collection: MapAssetFeatureCollection) {
   const positions: Array<[number, number]> = [];
@@ -79,11 +79,28 @@ export function DhMap({
       });
       map.addLayer({
         id: 'assets-points', type: 'circle', source: 'assets',
-        filter: ['==', ['geometry-type'], 'Point'],
-        paint: {
-          'circle-radius': 7, 'circle-color': '#2864dc',
-          'circle-stroke-color': '#ffffff', 'circle-stroke-width': 2,
-        },
+        filter: ['all', ['==', ['geometry-type'], 'Point'], ['==', ['get', 'entityKind'], 'ASSET']],
+        paint: { 'circle-radius': 7, 'circle-color': '#64748b', 'circle-stroke-color': '#ffffff', 'circle-stroke-width': 2 },
+      });
+      map.addLayer({
+        id: 'yacimiento-points', type: 'circle', source: 'assets',
+        filter: ['all', ['==', ['geometry-type'], 'Point'], ['==', ['get', 'entityKind'], 'YACIMIENTO']],
+        paint: { 'circle-radius': 9, 'circle-color': '#2563eb', 'circle-stroke-color': '#ffffff', 'circle-stroke-width': 2 },
+      });
+      map.addLayer({
+        id: 'company-points', type: 'circle', source: 'assets',
+        filter: ['all', ['==', ['geometry-type'], 'Point'], ['==', ['get', 'entityKind'], 'COMPANY']],
+        paint: { 'circle-radius': 8, 'circle-color': '#059669', 'circle-stroke-color': '#ffffff', 'circle-stroke-width': 2 },
+      });
+      map.addLayer({
+        id: 'act-points', type: 'circle', source: 'assets',
+        filter: ['all', ['==', ['geometry-type'], 'Point'], ['==', ['get', 'entityKind'], 'ACT']],
+        paint: { 'circle-radius': 9, 'circle-color': '#7c3aed', 'circle-stroke-color': '#ffffff', 'circle-stroke-width': 2 },
+      });
+      map.addLayer({
+        id: 'finding-points', type: 'circle', source: 'assets',
+        filter: ['all', ['==', ['geometry-type'], 'Point'], ['==', ['get', 'entityKind'], 'FINDING']],
+        paint: { 'circle-radius': 8, 'circle-color': '#dc2626', 'circle-stroke-color': '#ffffff', 'circle-stroke-width': 2 },
       });
       map.addLayer({
         id: 'assets-selected-polygons', type: 'line', source: 'assets',

web-v2/src/lib/api.ts

@@ -553,21 +553,34 @@ export interface AssetGeometry {
   updatedBy: string | null;
 }
 
+export type MapEntityKind = 'ASSET' | 'YACIMIENTO' | 'COMPANY' | 'ACT' | 'FINDING';
+
 export interface MapAssetProperties {
   id: string;
+  entityId?: string;
+  entityKind?: MapEntityKind;
   code: string;
   name: string;
   commonName?: string | null;
-  typeId: string;
-  typeCode: string;
+  typeId?: string | null;
+  typeCode?: string | null;
   typeName: string;
-  parentId: string | null;
-  parentName: string | null;
-  informationStatus: AssetInformationStatus;
+  parentId?: string | null;
+  parentName?: string | null;
+  informationStatus?: AssetInformationStatus | null;
   geometryType: AssetGeometryType;
-  accuracyM: number | null;
-  capturedAt: string | null;
+  accuracyM?: number | null;
+  capturedAt?: string | null;
   updatedAt: string;
+  href?: string | null;
+  contextLine?: string | null;
+  departmentName?: string | null;
+  areaName?: string | null;
+  yacimientoName?: string | null;
+  companyName?: string | null;
+  actCode?: string | null;
+  assetName?: string | null;
+  sourceGeometries?: number | null;
 }
 
 export interface MapAssetFeature {
@@ -1473,7 +1486,17 @@ export interface InspectionFinding {
   currentVersion: number;
   closedAt: string | null;
   closureNotes: string | null;
-  asset: InspectionAssetSummary;
+  asset: InspectionAssetSummary & {
+    typeCode?: string;
+    hierarchy?: {
+      department: { id: string; code: string; name: string } | null;
+      area: { id: string; code: string; name: string } | null;
+      yacimiento: { id: string; code: string; name: string } | null;
+      installation: { id: string; code: string; name: string } | null;
+      subinstallation: { id: string; code: string; name: string } | null;
+      company: { id: string; code: string; name: string } | null;
+    };
+  };
   catalog: {
     id: string;
     code: string;
@@ -2188,6 +2211,14 @@ export function removeAssetGeometry(assetId: string) {
   });
 }
 
+export function getMapOperationalContext() {
+  return apiRequest<MapAssetFeatureCollection>('/map/context');
+}
+
+export function getMapDocuments() {
+  return apiRequest<MapAssetFeatureCollection>('/map/documents');
+}
+
 export function getMapAssets(params: {
   bbox?: string;
   typeId?: string;

web-v2/src/lib/inspectionActF4Api.ts

@@ -73,11 +73,23 @@ export interface InspectionActListItemF4 {
   findingCount: number;
   companies: Array<{ id: string; code: string; name: string }>;
   areas: Array<{ id: string; code: string; name: string }>;
+  context: {
+    department: { id: string; code: string; name: string } | null;
+    area: { id: string; code: string; name: string } | null;
+    yacimiento: { id: string; code: string; name: string } | null;
+    company: { id: string; code: string; name: string } | null;
+    installations: Array<{ id: string; code: string; name: string }>;
+    subinstallations: Array<{ id: string; code: string; name: string }>;
+    legacyAreaScope: boolean;
+  };
   report: null | {
     id: string;
     code: string;
     status: InspectionReportStatusF4;
     pdfStatus: InspectionReportPdfStatus;
+    wordStatus: 'PENDING' | 'READY' | 'FAILED';
+    gedoIfIdentifier: string | null;
+    gedoOfficializedAt: string | null;
     generatedAt: string;
   };
   createdBy: InspectionPerson | null;

web-v2/src/pages/ActsPage.tsx

@@ -111,13 +111,13 @@ export function ActsPage() {
     {error && <Alert>{error}</Alert>}
     {loading ? <LoadingBlock label="Cargando actas…" /> : items.length === 0 ? <EmptyState title="Sin actas" text="No hay actas para los filtros seleccionados." /> : <div className="table-panel document-table">
       <div className="table-summary"><strong>{meta.total} acta{meta.total === 1 ? '' : 's'}</strong><span>Página {page} de {Math.max(meta.totalPages, 1)}</span></div>
-      <div className="table-scroll"><table><thead><tr><th>Acta</th><th>Empresa / área</th><th>Inspección</th><th>Hallazgos</th><th>Estado</th><th>Informe</th><th /></tr></thead><tbody>{items.map((act) => <tr key={act.id}>
+      <div className="table-scroll"><table><thead><tr><th>Acta</th><th>Empresa / territorio</th><th>Inspección</th><th>Hallazgos</th><th>Estado</th><th>Informe</th><th /></tr></thead><tbody>{items.map((act) => <tr key={act.id}>
         <td><div className="document-primary"><strong>{act.code}</strong><small>{formatDate(act.occurredAt)}</small></div></td>
-        <td><div className="document-primary"><strong>{contextLabel(act.companies, 'Empresa sin asignar')}</strong><small>{contextLabel(act.areas, 'Área sin asignar')}</small></div></td>
+        <td><div className="document-primary"><strong>{act.context.company?.name ?? contextLabel(act.companies, 'Empresa sin asignar')}</strong><small>{[act.context.department?.name, act.context.area?.name, act.context.yacimiento?.name].filter(Boolean).join(' · ') || contextLabel(act.areas, 'Área sin asignar')}</small></div></td>
         <td><Link className="text-link" to={`/inspecciones/${act.visitId}`}>{act.visit.code}</Link></td>
         <td><Link className="text-link" to={`/hallazgos?search=${encodeURIComponent(act.code)}`}>{act.findingCount}</Link></td>
         <td><span className={`status-badge ${inspectionActStatusClass(act.status)}`}>{inspectionActStatusLabel(act.status)}</span></td>
-        <td>{act.report ? <Link className="text-link" to={`/informes/${act.report.id}`}>{act.report.code}<small className="block-muted">{act.report.pdfStatus === 'READY' ? 'PDF disponible' : 'PDF pendiente'}</small></Link> : ['SEALED', 'CLOSED'].includes(act.status) ? <span className="status-badge pending">Pendiente de emisión</span> : <span className="muted">—</span>}</td>
+        <td>{act.report ? <Link className="text-link" to={`/informes/${act.report.id}`}>{act.report.code}<small className="block-muted">{act.report.status === 'OFFICIALIZED' ? `Oficializado en GEDO${act.report.gedoIfIdentifier ? ` · ${act.report.gedoIfIdentifier}` : ''}` : act.report.wordStatus === 'READY' ? 'INF listo' : 'En preparación'}</small></Link> : ['SEALED', 'CLOSED'].includes(act.status) ? <span className="status-badge pending">Pendiente de emisión</span> : <span className="muted">—</span>}</td>
         <td className="action-cell"><Link className="icon-button" to={`/inspecciones/actas/${act.id}`} aria-label={`Abrir ${act.code}`}><Icon name="chevron" /></Link></td>
       </tr>)}</tbody></table></div>
       <div className="pagination"><button className="button secondary" disabled={page <= 1} onClick={() => setPage(page - 1)}>Anterior</button><span>{meta.total ? `${(page - 1) * meta.pageSize + 1}–${Math.min(page * meta.pageSize, meta.total)} de ${meta.total}` : '0 resultados'}</span><button className="button secondary" disabled={page >= meta.totalPages} onClick={() => setPage(page + 1)}>Siguiente</button></div>

web-v2/src/pages/InspectionActEditorPage.tsx

@@ -80,10 +80,23 @@ export function InspectionActEditorPage() {
       <div className="act-document-primary-copy"><span className="asset-symbol"><Icon name="clipboard" /></span><div><span className="eyebrow">DOCUMENTO DEL ACTA</span><h2>{isSealed ? 'Acta consolidada disponible' : 'Acta en preparación'}</h2><p>{isSealed ? 'Abrí o descargá el Acta firmada, con sus Hallazgos y constancias de integridad.' : 'El documento definitivo se genera al firmar y cerrar el Acta.'}</p></div></div>
       <div className="act-primary-actions">{isSealed ? <><button className="button primary" type="button" disabled={pdfBusy} onClick={() => void openActPdf(false)}>{pdfBusy ? 'Preparando…' : 'Abrir PDF del Acta'}</button><button className="button secondary" type="button" disabled={pdfBusy} onClick={() => void openActPdf(true)}>Descargar PDF</button></> : <span className="status-badge pending">{inspectionActStatusLabel(act.status)}</span>}</div>
     </section>}
-    {act?.report && <div className="temporal-notice"><Icon name="clipboard" /><p><strong>Informe relacionado: <Link to={`/informes/${act.report.id}`}>{act.report.code}</Link>.</strong> {act.report.pdfStatus === 'READY' ? ' Disponible.' : ' En preparación.'}</p></div>}
+    {act?.report && <div className="temporal-notice"><Icon name="clipboard" /><p><strong>Informe relacionado: <Link to={`/informes/${act.report.id}`}>{act.report.code}</Link>.</strong> {act.report.status === 'OFFICIALIZED' ? ` Oficializado en GEDO${act.report.gedoIfIdentifier ? ` · ${act.report.gedoIfIdentifier}` : ''}.` : act.report.status === 'FROZEN' ? ' Informe consolidado.' : act.report.wordStatus === 'READY' ? ' INF listo para enviar a GEDO.' : ' En preparación.'}</p></div>}
     {isSealed && act && !act.report && <div className="temporal-notice"><Icon name="clipboard" /><p><strong>INF pendiente de emisión.</strong> El Acta ya está sellada y disponible como documento fuente.</p></div>}
     {act?.status === 'CANCELLED' && <Alert>Cancelada: {act.cancellationReason}</Alert>}
 
+    {act && <section className="panel inspection-act-context">
+      <div className="panel-heading"><div><span className="eyebrow">CONTEXTO DEL ACTA</span><h2>Ubicación territorial y operativa</h2><p className="section-copy">El Acta corresponde a un Yacimiento y los Hallazgos se ubican dentro de sus Instalaciones y Subinstalaciones.</p></div></div>
+      <div className="responsible-summary">
+        <div><small>Departamento</small><strong>{act.context.department?.name ?? 'Sin definir'}</strong>{act.context.department && <span>{act.context.department.code}</span>}</div>
+        <div><small>Área</small><strong>{act.context.area?.name ?? 'Sin definir'}</strong>{act.context.area && <span>{act.context.area.code}</span>}</div>
+        <div><small>Yacimiento</small><strong>{act.context.yacimiento?.name ?? 'No definido en la Inspección histórica'}</strong>{act.context.yacimiento && <span>{act.context.yacimiento.code}</span>}</div>
+        <div><small>Empresa / Operadora</small><strong>{act.context.company?.name ?? 'Sin definir'}</strong>{act.context.company && <span>{act.context.company.code}</span>}</div>
+        <div><small>Instalaciones con Hallazgos</small><strong>{act.context.installations.length ? act.context.installations.map((item) => item.name).join(' · ') : 'Ninguna'}</strong></div>
+        <div><small>Subinstalaciones con Hallazgos</small><strong>{act.context.subinstallations.length ? act.context.subinstallations.map((item) => item.name).join(' · ') : 'Ninguna'}</strong></div>
+      </div>
+      {act.context.legacyAreaScope && !act.context.yacimiento && <Alert type="info">Esta Acta pertenece a una Inspección histórica creada antes de exigir Yacimiento como alcance. El Área se conserva como fue registrada; no se la presenta como Yacimiento.</Alert>}
+    </section>}
+
     {act && <section className="panel inspection-act-form">
       <div className="responsible-summary">
         <div><small>Fecha de inspección</small><strong>{formatDate(act.occurredAt)}</strong></div>

web-v2/src/pages/MapPage.tsx

@@ -1,74 +1,96 @@
 import { SearchableSelect } from '../components/SearchableSelect';
 import { useEffect, useMemo, useState } from 'react';
 import { Link } from 'react-router';
+import { useAuth } from '../auth/AuthContext';
 import { Alert, LoadingBlock, errorMessage } from '../components/Feedback';
 import { Icon } from '../components/Icon';
 import { AssetCenterTabs } from '../features/assets/AssetCenterTabs';
 import { DhMap } from '../features/map/DhMap';
-import {
-  assetStatusClass,
-  assetStatusLabel,
-  ASSET_STATUSES,
-} from '../features/assets/assetPresentation';
-import { getMapAssets, listAssetTypes } from '../lib/api';
-import type {
-  AssetGeometryType,
-  AssetInformationStatus,
-  AssetType,
-  MapAssetFeatureCollection,
-} from '../lib/api';
+import { assetStatusClass, assetStatusLabel, ASSET_STATUSES } from '../features/assets/assetPresentation';
+import { getMapAssets, getMapDocuments, getMapOperationalContext, listAssetTypes } from '../lib/api';
+import type { AssetGeometryType, AssetInformationStatus, AssetType, MapAssetFeatureCollection, MapEntityKind } from '../lib/api';
 import { formatDate } from '../lib/format';
 
-const emptyCollection: MapAssetFeatureCollection = {
-  type: 'FeatureCollection', features: [], meta: { count: 0, truncated: false },
+const emptyCollection: MapAssetFeatureCollection = { type: 'FeatureCollection', features: [], meta: { count: 0, truncated: false } };
+const layerLabels: Record<MapEntityKind, string> = {
+  ASSET: 'Inventario GPS', YACIMIENTO: 'Yacimientos', COMPANY: 'Empresas', ACT: 'Actas', FINDING: 'Hallazgos',
 };
 
 export function MapPage() {
+  const { hasPermission } = useAuth();
+  const canReadDocuments = hasPermission('inspection_acts.read') && hasPermission('inspection_findings.read');
   const [types, setTypes] = useState<AssetType[]>([]);
-  const [data, setData] = useState<MapAssetFeatureCollection>(emptyCollection);
+  const [assets, setAssets] = useState<MapAssetFeatureCollection>(emptyCollection);
+  const [context, setContext] = useState<MapAssetFeatureCollection>(emptyCollection);
+  const [documents, setDocuments] = useState<MapAssetFeatureCollection>(emptyCollection);
   const [typeId, setTypeId] = useState('');
   const [status, setStatus] = useState<AssetInformationStatus | ''>('');
   const [geometryType, setGeometryType] = useState<AssetGeometryType | ''>('');
+  const [mapSearch, setMapSearch] = useState('');
+  const [layers, setLayers] = useState<Record<MapEntityKind, boolean>>({ ASSET: true, YACIMIENTO: true, COMPANY: true, ACT: true, FINDING: true });
   const [selectedId, setSelectedId] = useState<string | null>(null);
   const [loading, setLoading] = useState(true);
   const [error, setError] = useState('');
 
-  useEffect(() => {
-    listAssetTypes().then(setTypes).catch(() => undefined);
-  }, []);
-
+  useEffect(() => { listAssetTypes().then(setTypes).catch(() => undefined); }, []);
   useEffect(() => {
     setLoading(true); setError('');
-    getMapAssets({ typeId, status, geometryType })
-      .then((result) => {
-        setData(result);
-        setSelectedId((current) => result.features.some((item) => item.id === current) ? current : null);
-      })
-      .catch((requestError) => setError(errorMessage(requestError)))
-      .finally(() => setLoading(false));
-  }, [typeId, status, geometryType]);
+    Promise.all([
+      getMapAssets({ typeId, status, geometryType }),
+      getMapOperationalContext(),
+      canReadDocuments ? getMapDocuments() : Promise.resolve(emptyCollection),
+    ]).then(([assetResult, contextResult, documentResult]) => {
+      setAssets(assetResult); setContext(contextResult); setDocuments(documentResult);
+    }).catch((requestError) => setError(errorMessage(requestError))).finally(() => setLoading(false));
+  }, [typeId, status, geometryType, canReadDocuments]);
 
-  const selected = useMemo(
-    () => data.features.find((feature) => feature.id === selectedId) ?? null,
-    [data, selectedId],
-  );
+  const data = useMemo<MapAssetFeatureCollection>(() => {
+    const directAssets = assets.features.filter((feature) => !['yacimiento', 'empresa'].includes(feature.properties.typeCode?.toLowerCase() ?? ''));
+    const all = [...directAssets, ...context.features, ...documents.features];
+    const term = mapSearch.trim().toLocaleLowerCase('es-AR');
+    const features = all.filter((feature) => {
+      if (!layers[feature.properties.entityKind ?? 'ASSET']) return false;
+      if (!term) return true;
+      const searchable = [
+        feature.properties.code, feature.properties.name, feature.properties.typeName,
+        feature.properties.contextLine, feature.properties.departmentName, feature.properties.areaName,
+        feature.properties.yacimientoName, feature.properties.companyName, feature.properties.actCode,
+        feature.properties.assetName,
+      ].filter(Boolean).join(' ').toLocaleLowerCase('es-AR');
+      return searchable.includes(term);
+    });
+    return { type: 'FeatureCollection', features, meta: { count: features.length, truncated: assets.meta.truncated } };
+  }, [assets, context, documents, layers, mapSearch]);
+
+  useEffect(() => {
+    setSelectedId((current) => data.features.some((item) => item.id === current) ? current : null);
+  }, [data]);
+
+  const selected = useMemo(() => data.features.find((feature) => feature.id === selectedId) ?? null, [data, selectedId]);
+  const toggleLayer = (kind: MapEntityKind) => setLayers((current) => ({ ...current, [kind]: !current[kind] }));
+  const kind = selected?.properties.entityKind ?? 'ASSET';
 
   return <section>
-    <div className="page-heading"><div><span className="eyebrow">INVENTARIOS</span><h1>Mapa de inventarios</h1><p>Vista territorial de las ubicaciones registradas.</p></div><span className="map-count"><strong>{data.meta.count}</strong> geometría{data.meta.count === 1 ? '' : 's'}</span></div>
+    <div className="page-heading"><div><span className="eyebrow">TERRITORIO Y OPERACIÓN</span><h1>Mapa operativo</h1><p>Yacimientos, presencia de Empresas, Actas, Hallazgos e Inventario con ubicación real o derivada de geometrías registradas.</p></div><span className="map-count"><strong>{data.meta.count}</strong> elemento{data.meta.count === 1 ? '' : 's'}</span></div>
     <AssetCenterTabs active="map" />
     {error && <Alert>{error}</Alert>}
-    {data.meta.truncated && <Alert type="info">Se muestran los primeros 5000 registros. Aplicá filtros para reducir el resultado.</Alert>}
+    {data.meta.truncated && <Alert type="info">Se muestran los primeros 5000 registros de Inventario. Aplicá filtros para reducir el resultado.</Alert>}
     <div className="map-layout operational-map-layout">
       <aside className="filters map-sidebar">
-        <div><span className="eyebrow">FILTROS</span><h2>Vista territorial</h2></div>
-        <label className="field"><span>Tipo de elemento</span><SearchableSelect value={typeId} onChange={(event) => setTypeId(event.target.value)}><option value="">Todos</option>{types.map((type) => <option key={type.id} value={type.id}>{type.name}</option>)}</SearchableSelect></label>
-        <label className="field"><span>Estado de información</span><SearchableSelect value={status} onChange={(event) => setStatus(event.target.value as AssetInformationStatus | '')}><option value="">Todos</option>{ASSET_STATUSES.map((item) => <option key={item.value} value={item.value}>{item.label}</option>)}</SearchableSelect></label>
-        <label className="field"><span>Geometría</span><SearchableSelect value={geometryType} onChange={(event) => setGeometryType(event.target.value as AssetGeometryType | '')}><option value="">Todas</option><option value="POINT">Puntos</option><option value="LINESTRING">Líneas</option><option value="POLYGON">Polígonos</option></SearchableSelect></label>
-        <button className="button secondary wide" onClick={() => { setTypeId(''); setStatus(''); setGeometryType(''); }}>Limpiar filtros</button>
+        <div><span className="eyebrow">CAPAS</span><h2>Qué mostrar</h2></div>
+        <label className="search-field map-global-search"><Icon name="search" /><input value={mapSearch} onChange={(event) => setMapSearch(event.target.value)} placeholder="Buscar Yacimiento, Empresa, Acta, Hallazgo…" /></label>
+        <div className="map-layer-buttons">
+          {(Object.keys(layerLabels) as MapEntityKind[]).map((item) => item === 'ACT' || item === 'FINDING' ? (canReadDocuments && <button key={item} type="button" className={`button compact ${layers[item] ? 'primary' : 'secondary'}`} onClick={() => toggleLayer(item)}>{layerLabels[item]}</button>) : <button key={item} type="button" className={`button compact ${layers[item] ? 'primary' : 'secondary'}`} onClick={() => toggleLayer(item)}>{layerLabels[item]}</button>)}
+        </div>
+        <div><span className="eyebrow">FILTROS DE INVENTARIO</span></div>
+        <label className="field"><span>Tipo de elemento</span><SearchableSelect value={typeId} onChange={(event) => setTypeId(event.target.value)} disabled={!layers.ASSET}><option value="">Todos</option>{types.map((type) => <option key={type.id} value={type.id}>{type.name}</option>)}</SearchableSelect></label>
+        <label className="field"><span>Estado de información</span><SearchableSelect value={status} onChange={(event) => setStatus(event.target.value as AssetInformationStatus | '')} disabled={!layers.ASSET}><option value="">Todos</option>{ASSET_STATUSES.map((item) => <option key={item.value} value={item.value}>{item.label}</option>)}</SearchableSelect></label>
+        <label className="field"><span>Geometría</span><SearchableSelect value={geometryType} onChange={(event) => setGeometryType(event.target.value as AssetGeometryType | '')} disabled={!layers.ASSET}><option value="">Todas</option><option value="POINT">Puntos</option><option value="LINESTRING">Líneas</option><option value="POLYGON">Polígonos</option></SearchableSelect></label>
+        <button className="button secondary wide" onClick={() => { setTypeId(''); setStatus(''); setGeometryType(''); }}>Limpiar filtros de Inventario</button>
 
-        {selected && <div className="map-selection"><span className="eyebrow">REGISTRO SELECCIONADO</span><h3>{selected.properties.name}</h3><code>{selected.properties.code}</code><div className="map-selection-meta"><span className="tag">{selected.properties.typeName}</span><span className={`status-badge ${assetStatusClass(selected.properties.informationStatus)}`}>{assetStatusLabel(selected.properties.informationStatus)}</span></div>{selected.properties.parentName && <p>Depende de <strong>{selected.properties.parentName}</strong></p>}<p>{selected.properties.geometryType === 'POINT' ? 'Punto' : selected.properties.geometryType === 'LINESTRING' ? 'Línea' : 'Polígono'} · actualizado {formatDate(selected.properties.updatedAt)}</p>{selected.properties.accuracyM != null && <p>Precisión informada: {selected.properties.accuracyM} m</p>}<Link className="button primary wide" to={`/inventarios/${selected.id}`}>Abrir registro <Icon name="chevron" /></Link></div>}
+        {selected && <div className="map-selection"><span className="eyebrow">{layerLabels[kind]}</span><h3>{selected.properties.name}</h3><code>{selected.properties.code}</code><div className="map-selection-meta"><span className="tag">{selected.properties.typeName}</span>{kind === 'ASSET' && selected.properties.informationStatus && <span className={`status-badge ${assetStatusClass(selected.properties.informationStatus)}`}>{assetStatusLabel(selected.properties.informationStatus)}</span>}</div>{selected.properties.contextLine && <p>{selected.properties.contextLine}</p>}{selected.properties.departmentName && <p><strong>Departamento:</strong> {selected.properties.departmentName}</p>}{selected.properties.areaName && <p><strong>Área:</strong> {selected.properties.areaName}</p>}{selected.properties.yacimientoName && <p><strong>Yacimiento:</strong> {selected.properties.yacimientoName}</p>}{selected.properties.companyName && <p><strong>Empresa:</strong> {selected.properties.companyName}</p>}{selected.properties.assetName && <p><strong>Elemento:</strong> {selected.properties.assetName}</p>}<p>Ubicación actualizada {formatDate(selected.properties.updatedAt)}</p>{selected.properties.sourceGeometries != null && <p><small>Ubicación territorial derivada de {selected.properties.sourceGeometries} geometría{selected.properties.sourceGeometries === 1 ? '' : 's'} registrada{selected.properties.sourceGeometries === 1 ? '' : 's'} en el Yacimiento.</small></p>}{selected.properties.href && <Link className="button primary wide" to={selected.properties.href}>Abrir {layerLabels[kind].replace(/s$/, '')} <Icon name="chevron" /></Link>}</div>}
       </aside>
-      <div className="map-stage">{loading && <div className="map-loading"><LoadingBlock label="Actualizando mapa…" /></div>}<DhMap data={data} selectedId={selectedId} onSelect={setSelectedId} />{!loading && data.features.length === 0 && <div className="map-empty"><Icon name="map" size={30} /><strong>No hay geometrías para mostrar</strong><span>Agregá una ubicación desde el detalle de un registro.</span></div>}</div>
+      <div className="map-stage">{loading && <div className="map-loading"><LoadingBlock label="Actualizando mapa…" /></div>}<DhMap data={data} selectedId={selectedId} onSelect={setSelectedId} />{!loading && data.features.length === 0 && <div className="map-empty"><Icon name="map" size={30} /><strong>No hay ubicaciones para mostrar</strong><span>Las capas sólo muestran registros con una geometría real propia o derivable de su Yacimiento.</span></div>}</div>
     </div>
   </section>;
 }

web-v2/src/styles.css

@@ -1436,3 +1436,9 @@ code { color: #5e6677; font-family: ui-monospace, monospace; font-size: 9px; }
 
 .act-other-asset-photos { border-top: 1px solid #e3eaf5; margin-top: 24px; padding-top: 20px; }
 .act-other-asset-photos h3 { margin: 0 0 14px; }
+
+/* F6.15 · capas del mapa operativo */
+.map-layer-buttons { display: flex; flex-wrap: wrap; gap: 6px; }
+.map-layer-buttons .button { flex: 1 1 calc(50% - 6px); justify-content: center; min-width: 104px; }
+.map-global-search { width: 100%; margin: 0; }
+.act-finding-context { margin: 10px 0 12px; }