uk_bin_collection 0.146.2__tar.gz → 0.147.1__tar.gz

{uk_bin_collection-0.146.2 → uk_bin_collection-0.147.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: uk_bin_collection
-Version: 0.146.2
+Version: 0.147.1
 Summary: Python Lib to collect UK Bin Data
 Author: Robert Bradley
 Author-email: robbrad182@gmail.com
@@ -9,7 +9,6 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Requires-Dist: bs4
-Requires-Dist: geopandas (>=1.0.1,<2.0.0)
 Requires-Dist: holidays
 Requires-Dist: icalevents (>=0.2.1,<0.3.0)
 Requires-Dist: lxml
@@ -362,6 +361,42 @@ All integration tests results are in [CodeCov](https://app.codecov.io/gh/robbrad
 ### Nightly Full Integration Test Reports:
 - [Nightly Council Test](https://app.codecov.io/gh/robbrad/UKBinCollectionData/tests/master)
 
+
+🗺️ View Test Coverage Map (in VS Code)
+---------------------------------------
+
+You can generate integration test results and view the interactive UK council coverage map with traffic-light-style statuses for each council.
+
+### 🧪 Step 1: Run Integration Tests
+
+Run: `make integration-tests`
+
+This runs the full BDD test suite and outputs a `junit.xml` report to:
+
+`build/test/integration-test-results/junit.xml`
+
+### 📊 Step 2: Generate Map Test Results JSON
+
+Convert the JUnit XML output to a flat test result JSON: `make generate-test-map-test-results`
+
+This creates: `build/integration-test-results/test_results.json`
+
+This file is used by the map to color each council:
+
+*   ✅ Green: Test passed
+*   🟠 Amber: Test failed
+*   ❌ Red: Not integrated
+
+### 🗺️ Step 3: Open the Map
+
+Open the map viewer in VS Code:
+
+1.  Right-click the `map.html` file in VSCode and choose **Show Preview**
+    
+2.  The map will open in your browser, showing real-time integration coverage and test results.
+
+![Test Results Map](test_results_map.png)
+
 ---
 ## Docker API Server
 We have created an API for this located under [uk_bin_collection_api_server](https://github.com/robbrad/UKBinCollectionData/uk_bin_collection_api_server)

{uk_bin_collection-0.146.2 → uk_bin_collection-0.147.1}/README.md

@@ -337,6 +337,42 @@ All integration tests results are in [CodeCov](https://app.codecov.io/gh/robbrad
 ### Nightly Full Integration Test Reports:
 - [Nightly Council Test](https://app.codecov.io/gh/robbrad/UKBinCollectionData/tests/master)
 
+
+🗺️ View Test Coverage Map (in VS Code)
+---------------------------------------
+
+You can generate integration test results and view the interactive UK council coverage map with traffic-light-style statuses for each council.
+
+### 🧪 Step 1: Run Integration Tests
+
+Run: `make integration-tests`
+
+This runs the full BDD test suite and outputs a `junit.xml` report to:
+
+`build/test/integration-test-results/junit.xml`
+
+### 📊 Step 2: Generate Map Test Results JSON
+
+Convert the JUnit XML output to a flat test result JSON: `make generate-test-map-test-results`
+
+This creates: `build/integration-test-results/test_results.json`
+
+This file is used by the map to color each council:
+
+*   ✅ Green: Test passed
+*   🟠 Amber: Test failed
+*   ❌ Red: Not integrated
+
+### 🗺️ Step 3: Open the Map
+
+Open the map viewer in VS Code:
+
+1.  Right-click the `map.html` file in VSCode and choose **Show Preview**
+    
+2.  The map will open in your browser, showing real-time integration coverage and test results.
+
+![Test Results Map](test_results_map.png)
+
 ---
 ## Docker API Server
 We have created an API for this located under [uk_bin_collection_api_server](https://github.com/robbrad/UKBinCollectionData/uk_bin_collection_api_server)

{uk_bin_collection-0.146.2 → uk_bin_collection-0.147.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "uk_bin_collection"
-version = "0.146.2"
+version = "0.147.1"
 description = "Python Lib to collect UK Bin Data"
 readme = "README.md"
 authors = ["Robert Bradley <robbrad182@gmail.com>"]
@@ -33,13 +33,13 @@ pylint = "*"
 pytest = "*"
 setuptools = "*"
 pytest-bdd = "*"
-allure-pytest-bdd = "*"
 pytest-xdist = {extras = ["psutil"], version = "*"}
 pyhamcrest = "*"
 tabulate = "^0.9.0"
 pytest-asyncio = "^0.24.0"
 pytest-freezer = "^0.4.8"
 homeassistant = "^2023.10"
+geopandas = "^1.0.1"
 
 [tool.poetry.scripts]
 uk_bin_collection = "uk_bin_collection.uk_bin_collection.collect_data:run"
@@ -63,7 +63,6 @@ urllib3 = "*"
 webdriver-manager = "^4.0.1"
 tabulate = "^0.9.0"
 icalevents = "^0.2.1"
-geopandas = "^1.0.1"
 
 [tool.commitizen]
 major_version_zero = true

uk_bin_collection-0.147.1/uk_bin_collection/map.html

@@ -0,0 +1,114 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+  <meta charset="UTF-8" />
+  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+  <title>UK Council Coverage Map</title>
+  <link rel="stylesheet" href="https://unpkg.com/leaflet@1.9.4/dist/leaflet.css" />
+  <style>
+    #map {
+      height: 100vh;
+    }
+  </style>
+</head>
+
+<body>
+  <div id="map"></div>
+
+  <script src="https://unpkg.com/leaflet@1.9.4/dist/leaflet.js"></script>
+  <script>
+    const map = L.map('map').setView([54.5, -2.7], 6); // Centered on UK
+
+    L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
+      attribution: '© OpenStreetMap contributors'
+    }).addTo(map);
+
+    function slugify(str) {
+      return str.toLowerCase().replace(/[^a-z0-9]+/g, '-').replace(/(^-|-$)/g, '');
+    }
+
+    Promise.all([
+      fetch('tests/input.json').then(res => res.json()),
+      fetch('../build/integration-test-results/test_results.json').then(res => res.json()).catch(() => ({}))
+    ])
+    .then(([integrationData, testResults]) => {
+      console.log("🔍 Loaded integration data:", integrationData);
+      console.log("🧪 Loaded test results:", testResults);
+
+      const coveredLADs = new Set();
+      const integrationByLAD24CD = {};
+      const testStatusByLAD24CD = {};
+
+      for (const [moduleName, entry] of Object.entries(integrationData)) {
+        const wikiName = entry.wiki_name || moduleName;
+        const wikiUrl = `https://github.com/robbrad/UKBinCollectionData/wiki/Councils#${slugify(wikiName)}`;
+        const normalizeKey = str => str.toLowerCase().replace(/[^a-z0-9]/g, '');
+
+        const testResult = testResults[normalizeKey(moduleName)] || null;
+
+        const addCode = (code) => {
+          const cleanCode = code?.replace(/[^\x20-\x7E]/g, '').trim();
+          if (!cleanCode) return;
+
+          coveredLADs.add(cleanCode);
+          if (!integrationByLAD24CD[cleanCode]) {
+            integrationByLAD24CD[cleanCode] = { wiki_name: wikiName, url: wikiUrl };
+            testStatusByLAD24CD[cleanCode] = testResult;
+          }
+        };
+
+        if (entry.LAD24CD) addCode(entry.LAD24CD);
+        if (Array.isArray(entry.supported_councils_LAD24CD)) {
+          for (const code of entry.supported_councils_LAD24CD) addCode(code);
+        }
+      }
+
+      return fetch('Local_Authority_Boundaries.geojson')
+        .then(res => res.json())
+        .then(geojson => {
+          L.geoJSON(geojson, {
+            style: feature => {
+              const code = feature.properties.LAD24CD?.trim();
+              const isCovered = coveredLADs.has(code);
+              const testResult = testStatusByLAD24CD[code];
+
+              let fillColor = 'red'; // default: not covered
+              if (isCovered) {
+                fillColor = (testResult === 'pass') ? 'green' :
+                            (testResult === 'fail') ? 'orange' : 'green';
+              }
+
+              return {
+                color: '#333',
+                weight: 1,
+                fillColor,
+                fillOpacity: 0.6
+              };
+            },
+            onEachFeature: (feature, layer) => {
+              const code = feature.properties.LAD24CD?.trim();
+              const name = feature.properties.LAD24NM;
+              const isCovered = coveredLADs.has(code);
+              const testResult = testStatusByLAD24CD[code];
+              const wiki = integrationByLAD24CD[code];
+
+              if (!code) return;
+
+              if (isCovered && wiki) {
+                const status = (testResult === 'pass') ? '✅ Covered (Test Passed)' :
+                               (testResult === 'fail') ? '🟠 Covered (Test Failed)' :
+                               '✅ Covered (No test result)';
+                layer.bindPopup(`<strong>${name}</strong><br>Status: ${status}<br><a href="${wiki.url}" target="_blank">📘 ${wiki.wiki_name}</a>`);
+              } else {
+                layer.bindPopup(`<strong>${name}</strong><br>Status: ❌ Not Covered`);
+              }
+            }
+          }).addTo(map);
+        });
+    })
+    .catch(err => console.error('❌ Error loading data:', err));
+  </script>
+</body>
+
+</html>

uk_bin_collection-0.147.1/uk_bin_collection/tests/generate_map_test_results.py

@@ -0,0 +1,46 @@
+import sys
+import json
+import xml.etree.ElementTree as ET
+from collections import defaultdict
+import re
+
+def extract_council_name(testname):
+    """
+    Extracts the council name from the test name.
+    E.g. "test_scenario_outline[BarnetCouncil]" => "barnetcouncil"
+    """
+    match = re.search(r'\[(.*?)\]', testname)
+    if match:
+        return match.group(1).strip().lower()
+    return None
+
+def parse_junit_xml(path):
+    tree = ET.parse(path)
+    root = tree.getroot()
+
+    results = defaultdict(lambda: "pass")
+
+    for testcase in root.iter("testcase"):
+        testname = testcase.attrib.get("name", "")
+        council = extract_council_name(testname)
+        if not council:
+            continue
+
+        if testcase.find("failure") is not None or testcase.find("error") is not None:
+            results[council] = "fail"
+
+    return results
+
+def main():
+    if len(sys.argv) != 2:
+        print("Usage: python generate_test_results.py <junit.xml path>")
+        sys.exit(1)
+
+    junit_path = sys.argv[1]
+    results = parse_junit_xml(junit_path)
+
+    print(json.dumps(results, indent=2))
+
+
+if __name__ == "__main__":
+    main()

uk_bin_collection-0.146.2/uk_bin_collection/map.html

@@ -1,118 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
-  <meta charset="UTF-8" />
-  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-  <title>UK Council Coverage Map</title>
-  <link rel="stylesheet" href="https://unpkg.com/leaflet@1.9.4/dist/leaflet.css" />
-  <style>
-    #map {
-      height: 100vh;
-    }
-  </style>
-</head>
-
-<body>
-  <div id="map"></div>
-
-  <script src="https://unpkg.com/leaflet@1.9.4/dist/leaflet.js"></script>
-  <script>
-    const map = L.map('map').setView([54.5, -2.7], 6); // Centered on UK
-
-    L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
-      attribution: '© OpenStreetMap contributors'
-    }).addTo(map);
-
-    // Helper to slugify wiki anchor
-    function slugify(str) {
-      return str.toLowerCase().replace(/[^a-z0-9]+/g, '-').replace(/(^-|-$)/g, '');
-    }
-
-    fetch('tests/input.json')
-      .then(res => res.json())
-      .then(integrationData => {
-        console.log("🔍 Loaded integration data:", integrationData);
-
-        const coveredLADs = new Set();
-        const integrationByLAD24CD = {};
-
-        for (const [moduleName, entry] of Object.entries(integrationData)) {
-          const wikiName = entry.wiki_name || moduleName;
-          const wikiUrl = `https://github.com/robbrad/UKBinCollectionData/wiki/Councils#${slugify(wikiName)}`;
-
-          // Case 1: Direct LAD24CD
-          if (entry.LAD24CD) {
-            const code = entry.LAD24CD?.replace(/[^\x20-\x7E]/g, '').trim();
-            if (code) {
-              coveredLADs.add(code);
-              integrationByLAD24CD[code] = { wiki_name: wikiName, url: wikiUrl };
-            } else {
-              console.warn("⚠️ Entry with bad LAD24CD:", moduleName, entry);
-            }
-          }
-
-          // Case 2: Shared modules with multiple LADs
-          if (Array.isArray(entry.supported_councils_LAD24CD)) {
-            for (const codeRaw of entry.supported_councils_LAD24CD) {
-              const code = codeRaw?.replace(/[^\x20-\x7E]/g, '').trim();
-              if (code) {
-                coveredLADs.add(code);
-                // Only overwrite if not already present (prefer specific match)
-                if (!integrationByLAD24CD[code]) {
-                  integrationByLAD24CD[code] = { wiki_name: wikiName, url: wikiUrl };
-                }
-              }
-            }
-          }
-        }
-
-        console.log("📦 Final covered LADs:", [...coveredLADs]);
-
-        return fetch('Local_Authority_Boundaries.geojson')
-          .then(res => res.json())
-          .then(geojson => {
-            L.geoJSON(geojson, {
-              style: feature => {
-                const code = feature.properties.LAD24CD?.trim();
-                const isCovered = coveredLADs.has(code);
-                return {
-                  color: '#333',
-                  weight: 1,
-                  fillColor: isCovered ? 'green' : 'red',
-                  fillOpacity: 0.6
-                };
-              },
-              onEachFeature: (feature, layer) => {
-                const code = feature.properties.LAD24CD?.trim();
-                const name = feature.properties.LAD24NM;
-                const covered = coveredLADs.has(code);
-
-                if (!code) console.warn("⚠️ Missing LAD24CD in GeoJSON feature:", feature);
-                if (!covered && code) console.warn("❌ Not covered LAD:", code, name);
-
-                if (covered && integrationByLAD24CD[code]) {
-                  const wiki = integrationByLAD24CD[code];
-                  layer.bindPopup(
-                    `<strong>${name}</strong><br>Status: ✅ Covered<br>` +
-                    `<a href="${wiki.url}" target="_blank">📘 ${wiki.wiki_name}</a>`
-                  );
-                } else {
-                  layer.bindPopup(`<strong>${name}</strong><br>Status: ❌ Not Covered`);
-                }
-              }
-            }).addTo(map);
-
-            // Debug missing LADs
-            const missing = geojson.features
-              .map(f => [f.properties.LAD24CD?.trim(), f.properties.LAD24NM])
-              .filter(([code]) => !coveredLADs.has(code))
-              .map(([code, name]) => `${code} - ${name}`);
-            console.warn("🛠️ Missing LADs in input.json:", missing);
-          });
-      })
-      .catch(err => console.error('❌ Error loading data:', err));
-  </script>
-</body>
-
-</html>