Merge pull request #1319 from ch-bas/feat/cctv-model-specs-refresh

feat(cctv): vendor the Bosch MIC PTZ records the Amsterdam register names

DATA_SOURCES.md

@@ -224,7 +224,7 @@ The [Bhote Koshi event pack](public/events/bhote-koshi-2026/README.md), under `p
 | **Yale Bright Star Catalogue** (9,096 stars, sky background)                | `sky/`                            | **Public domain**                                                                                         | ✅ (no restrictions)                             | "Yale Bright Star Catalogue (Hoffleit & Warren, via CDS)" (courtesy credit) |
 | **ESO Milky Way panorama** (eso0932a, blurred cube map, sky background)     | `sky/`                            | **CC BY 4.0**                                                                                             | ✅ (attribution; changes stated)                 | "ESO/S. Brunier"                                                            |
 | **CCTV ground heights** (3,445 cameras)                                     | `cctv_ground_heights/`            | Precomputed camera placement heights, aligned to work with Google Photorealistic 3D Tiles (folder README) | —                                                | —                                                                           |
-| **CCTV Camera Database** model-enrichment extract v2.26.0 (17 camera-model records) | `src/layers/cctv/modelSpecs.js` | **CC0-1.0** (public domain dedication) | ✅ (no restrictions) | "Specs: cctv-database.com" (courtesy — not legally required) |
+| **CCTV Camera Database** model-enrichment extract v2.26.0 + v2.29.0 (20 camera-model records) | `src/layers/cctv/modelSpecs.js` | **CC0-1.0** (public domain dedication) | ✅ (no restrictions) | "Specs: cctv-database.com" (courtesy — not legally required) |
 
 ### ⚠️ TeleGeography is bundled but NonCommercial
 
@@ -252,13 +252,16 @@ fixtures retain their provenance in `src/data/fixtures/README.md`.
 
 ### CCTV Camera Database (`src/layers/cctv/modelSpecs.js`)
 
-The CCTV layer's hardware-model specs are a small verbatim extract (v2.26.0) of the
+The CCTV layer's hardware-model specs are a small extract (v2.26.0, plus the Bosch MIC
+records from v2.29.0) of the
 [CCTV Camera Database](https://github.com/ch-bas/cctv-camera-database), an open dataset of
 camera models transcribed from manufacturer datasheets, dedicated to the public domain under
-**CC0-1.0**. Only the records for hardware that the integrated public catalogs name (King
-County, Sarasota County and Sioux Falls) are bundled, compiled into the module. Nothing is
-fetched at runtime. The records describe camera products (optics, resolution, night vision)
-only, never endpoints, stream paths or access data. CC0 requires no attribution; the CCTV HUD
+**CC0-1.0**. Only records for hardware named by the integrated public catalogs (King County,
+Sarasota County and Sioux Falls) or by the City of Amsterdam register proposed in
+[#251](https://github.com/bilawalsidhu/gods-eye-view/pull/251) are bundled, compiled into the
+module. Nothing is fetched at runtime. The MIC records keep their specification fields; their
+titles are shortened to model codes and colour aliases are added. The records describe camera
+products (optics, resolution, night vision) only, never endpoints, stream paths or access data. CC0 requires no attribution; the CCTV HUD
 credits it anyway as `SPECS: CCTV-DATABASE.COM` beside any spec line it renders.
 
 ### Bundled OpenStreetMap data

changelog.d/1319-cctv-bosch-mic-specs.md

@@ -0,0 +1,3 @@
+- Vendor the Bosch MIC PTZ datasheet records that the City of Amsterdam camera
+  register names (MIC-7522, MIC-7502, MIC-7130), with the register's `x` colour
+  wildcard as an alias, from the CCTV Camera Database v2.29.0 (ch-bas, #1319).

docs/CURRENT-STATE.md

@@ -5160,6 +5160,10 @@ silently demoting every later lookup for the session.
   multi-sensor datasheets publish a capability range, not the lens's current zoom, so those
   cameras keep their estimate and show `SPEC FOV min–max° (CAPABILITY)` beside it. Public
   camera state carries `fovSource`, `specFovMinDeg`, `specFovMaxDeg` and `spec` (#452).
+  The table also has Bosch MIC-7130, MIC-7502 and MIC-7522 records for the Amsterdam
+  register proposed in #251, with its `x` colour aliases (#1319). Their datasheet FOV names
+  no axis, so it neither gives a capability range nor replaces the estimate. The records
+  alone do not enable that source pack.
 - **FIRMS**: no ground clamping (zero 3D-tiles height sampling), ≤18 screen-decluttered ambient labels, click-to-inspect detail card, 2.5k/3k sprite budgets viewport-clipped by FRP. Fire-power labels share display rounding before localization: one decimal below the rounded 10 MW boundary, then whole megawatts (for example, 9.96 MW reads 10 MW).
 - **CCTV v2 foundation:** a pitched
   frustum wireframe (4 corner rays + far-cap rectangle) with a monitor plane at the frustum's

src/layers/cctv/modelSpecs.js

@@ -12,20 +12,28 @@
  * Cameras without an identified model are untouched — unknown never implies
  * anything.
  *
- * Spec records are vendored verbatim from the CCTV Camera Database
+ * Specification fields are vendored from the CCTV Camera Database
  * (https://github.com/ch-bas/cctv-camera-database, CC0-1.0) — an open dataset
- * of 28,000+ camera models transcribed from manufacturer datasheets (84% with
- * FOV, as of v2.26.0). This module vendors the records that the currently integrated public
+ * of 29,000+ camera models transcribed from manufacturer datasheets (76% with
+ * FOV, as of v2.29.0). This module vendors records that the integrated public
  * catalogs publish hardware for — King County WA (Cohu, Bosch AUTODOME, Axis
  * Q6135-LE), plus the Bosch AUTODOME and Axis PTZ/multisensor models that
- * appear in Sarasota County FL and Sioux Falls SD open data; packs that
+ * appear in Sarasota County FL and Sioux Falls SD open data, plus the Bosch MIC
+ * PTZs for the City of Amsterdam camera register proposed in #251; packs that
  * publish other hardware models can grow it, or vendor the full extract.
  *
  * Scope guardrail: records describe camera PRODUCTS (optics, resolution,
  * night vision) — never endpoints, stream paths, or access/config data.
  */
 
-/** Verbatim records from the dataset's model-enrichment extract (v2.26.0). */
+/**
+ * Records from the dataset's model-enrichment extract: v2.26.0, plus the Bosch
+ * MIC records from v2.29.0 with titles shortened to model codes.
+ * A Bosch MIC order code ends in a colour letter (B, G, W; registries write
+ * `x`) on one shared datasheet. The colours are aliases of one record whose
+ * `model` leaves the letter out, so the HUD never names a variant the source
+ * did not.
+ */
 const RECORDS = [
   {
     id: 'axis-q6135-le',
@@ -264,6 +272,67 @@ const RECORDS = [
     autotracking: true,
     environment: ['outdoor'],
   },
+  {
+    id: 'bosch-mic-7130-pb4',
+    brand: 'Bosch',
+    model: 'MIC-7130-P_4',
+    type: 'ptz',
+    url: 'https://www.cctv-database.com/camera/bosch-mic-7130-pb4/',
+    aliases: [
+      'MIC IP starlight 7000 HD',
+      'MIC-7130-PB4',
+      'MIC-7130-PG4',
+      'MIC-7130-PW4',
+      'MIC-7130-Px4',
+    ],
+    fov_deg: '2.1-59',
+    resolution: { mp: 1, w: 1280, h: 720, label: '720p' },
+    ptz: true,
+    autotracking: true,
+    varifocal: true,
+    environment: ['outdoor'],
+  },
+  {
+    id: 'bosch-mic-7502-z30b',
+    brand: 'Bosch',
+    model: 'MIC-7502-Z30',
+    type: 'ptz',
+    url: 'https://www.cctv-database.com/camera/bosch-mic-7502-z30b/',
+    aliases: [
+      'MIC-7502-Z30B',
+      'MIC-7502-Z30G',
+      'MIC-7502-Z30W',
+      'MIC-7502-Z30x',
+    ],
+    fov_deg: '2.3-63.7',
+    resolution: { mp: 2.13, w: 1920, h: 1080, label: '1080p' },
+    ptz: true,
+    autotracking: true,
+    varifocal: true,
+    night_vision: { type: 'color' },
+    environment: ['outdoor'],
+  },
+  {
+    id: 'bosch-mic-7522-z30b',
+    brand: 'Bosch',
+    model: 'MIC-7522-Z30',
+    type: 'ptz',
+    url: 'https://www.cctv-database.com/camera/bosch-mic-7522-z30b/',
+    aliases: [
+      'MIC-7522-Z30B',
+      'MIC-7522-Z30G',
+      'MIC-7522-Z30W',
+      'MIC-7522-Z30x',
+    ],
+    fov_deg: '2.1-58.3',
+    // i18n-ignore: datasheet label
+    resolution: { mp: 2, w: 1920, h: 1080, label: '1080p HD' },
+    ptz: true,
+    varifocal: true,
+    night_vision: { type: 'color' },
+    environment: ['outdoor'],
+    ndaa_compliant: true,
+  },
   {
     id: 'cohu-3920-idome',
     brand: 'Cohu',
@@ -431,7 +500,7 @@ const NAME_INDEX = RECORDS.flatMap((record) => {
  * guesses).
  * @param {string} model - Hardware model as named by a source pack or seed.
  * @param {string} [manufacturer] - The source's manufacturer, when published.
- * @returns {Object|null} The verbatim spec record, or null when unknown.
+ * @returns {Object|null} The matched spec record, or null when unknown.
  */
 export function lookupModelSpec(model, manufacturer) {
   const query = words(model).map(stripVariantSuffix);

src/layers/cctv/modelSpecs.test.mjs

@@ -245,6 +245,95 @@ test('King County snapshot model strings still resolve', () => {
   );
 });
 
+test('Amsterdam camera register model strings resolve', () => {
+  // The register writes the Bosch MIC colour letter as `x`.
+  assert.equal(
+    lookupModelSpec('Bosch MIC-7522-Z30x')?.id,
+    'bosch-mic-7522-z30b',
+  );
+  assert.equal(
+    lookupModelSpec('Bosch MIC-7502-Z30x')?.id,
+    'bosch-mic-7502-z30b',
+  );
+  assert.equal(lookupModelSpec('Bosch MIC-7130-Px4')?.id, 'bosch-mic-7130-pb4');
+  assert.equal(lookupModelSpec('MIC-7522-Z30W')?.id, 'bosch-mic-7522-z30b');
+  // Its ANPR units are not in the table: unknown, never a guess.
+  assert.equal(lookupModelSpec('CSG-8800'), null);
+  // The MIC and AUTODOME starlight 7000 HD (code-less names, so the brand
+  // is needed) stay apart.
+  assert.equal(
+    lookupModelSpec('MIC IP starlight 7000 HD', 'Bosch')?.id,
+    'bosch-mic-7130-pb4',
+  );
+  assert.equal(
+    lookupModelSpec('AUTODOME IP starlight 7000 HD', 'Bosch')?.id,
+    'bosch-autodome-ip-starlight-7000-hd',
+  );
+  // The MIC datasheets state FOV without an axis, so no horizontal range.
+  assert.equal(horizontalFovRangeDeg(lookupModelSpec('MIC-7522-Z30B')), null);
+});
+
+test('Bosch MIC colour aliases resolve without accepting unknown variants', () => {
+  for (const [pattern, id] of [
+    ['MIC-7130-P?4', 'bosch-mic-7130-pb4'],
+    ['MIC-7502-Z30?', 'bosch-mic-7502-z30b'],
+    ['MIC-7522-Z30?', 'bosch-mic-7522-z30b'],
+  ]) {
+    for (const colour of ['B', 'G', 'W', 'x']) {
+      const model = pattern.replace('?', colour);
+      assert.equal(lookupModelSpec(model)?.id, id, model);
+      assert.equal(lookupModelSpec(`bosch ${model.toLowerCase()}`)?.id, id);
+      assert.equal(lookupModelSpec(model, 'Bosch')?.id, id);
+      assert.equal(lookupModelSpec(model, 'Axis'), null);
+      assert.equal(lookupModelSpec(`${model}-UNKNOWN`), null);
+    }
+    assert.equal(lookupModelSpec(pattern.replace('?', 'R')), null);
+  }
+});
+
+test('Bosch MIC HUD summary never names a colour the source did not', () => {
+  assert.equal(
+    specSummary(lookupModelSpec('MIC-7522-Z30W')),
+    'Bosch MIC-7522-Z30 · 1080p HD · COLOR · PTZ',
+  );
+  assert.equal(
+    specSummary(lookupModelSpec('Bosch MIC-7522-Z30x')),
+    'Bosch MIC-7522-Z30 · 1080p HD · COLOR · PTZ',
+  );
+  for (const pattern of ['MIC-7130-P?4', 'MIC-7502-Z30?', 'MIC-7522-Z30?']) {
+    for (const colour of ['B', 'G', 'W', 'x']) {
+      const spec = lookupModelSpec(pattern.replace('?', colour));
+      const summary = specSummary(spec);
+      for (const other of ['B', 'G', 'W', 'x']) {
+        assert.ok(!summary.includes(pattern.replace('?', other)), summary);
+      }
+    }
+  }
+});
+
+test('Bosch MIC catalog enrichment preserves estimated and explicit optics', () => {
+  for (const model of [
+    'Bosch MIC-7130-Px4',
+    'Bosch MIC-7502-Z30x',
+    'Bosch MIC-7522-Z30x',
+  ]) {
+    for (const pose of [{}, { fovDeg: 44 }, { poseSource: 'curated' }]) {
+      const [camera] = browserCatalog().buildCatalogFromSources([
+        { id: 'amsterdam-mic', lat: 52.37, lon: 4.9, model, ...pose },
+      ]);
+      assert.ok(camera.spec, model);
+      assert.equal(camera.fovDeg, pose.fovDeg ?? 74, model);
+      assert.equal(camera.fovSource, undefined);
+      assert.equal(camera.specFovMinDeg, undefined);
+      assert.equal(camera.specFovMaxDeg, undefined);
+      assert.equal(horizontalFovRangeDeg(camera.spec), null);
+      assert.equal(fixedHorizontalFovDeg(camera.spec), null);
+      assert.equal(specFovCapabilityToken(camera), null);
+      assert.match(specSummary(camera.spec), /^Bosch MIC-.* · PTZ$/);
+    }
+  }
+});
+
 test('catalog never overwrites an explicit FOV or a curated pose', () => {
   const [explicit, curated, cohu, pelco] =
     browserCatalog().buildCatalogFromSources([