uk_bin_collection 0.146.1__py3-none-any.whl → 0.147.0__py3-none-any.whl

uk_bin_collection/compare_lad_codes.py

@@ -0,0 +1,58 @@
+import json
+import geopandas as gpd
+
+def extract_lad_codes(input_json_path):
+    with open(input_json_path, "r") as f:
+        data = json.load(f)
+
+    lad_codes = set()
+    lad_code_to_council_input = {}
+
+    for council_key, council_info in data.items():
+        if isinstance(council_info, dict):
+            if "LAD24CD" in council_info:
+                code = council_info["LAD24CD"]
+                lad_codes.add(code)
+                lad_code_to_council_input[code] = council_key
+            if "supported_councils_LAD24CD" in council_info:
+                for code in council_info["supported_councils_LAD24CD"]:
+                    lad_codes.add(code)
+                    lad_code_to_council_input[code] = f"{council_key} (shared)"
+
+    return lad_codes, lad_code_to_council_input
+
+def compare_with_geojson(input_lad_codes, geojson_path):
+    gdf = gpd.read_file(geojson_path)
+    geojson_lad_codes = set(gdf["LAD24CD"].dropna().unique())
+
+    geojson_lad_map = {
+        row["LAD24CD"]: row["LAD24NM"]
+        for _, row in gdf.iterrows()
+        if "LAD24CD" in row and "LAD24NM" in row
+    }
+
+    missing_in_input = geojson_lad_codes - input_lad_codes
+    extra_in_input = input_lad_codes - geojson_lad_codes
+    matching = input_lad_codes & geojson_lad_codes
+
+    return matching, missing_in_input, extra_in_input, geojson_lad_map
+
+# --- Run the comparison ---
+input_json_path = "uk_bin_collection/tests/input.json"
+geojson_path = "uk_bin_collection/Local_Authority_Boundaries.geojson"
+
+input_lad_codes, input_name_map = extract_lad_codes(input_json_path)
+matching, missing, extra, geojson_name_map = compare_with_geojson(input_lad_codes, geojson_path)
+
+# --- Print results ---
+print(f"✅ Matching LAD24CDs ({len(matching)}):")
+for code in sorted(matching):
+    print(f"  {code} → input.json: {input_name_map.get(code)} | geojson: {geojson_name_map.get(code)}")
+
+print(f"\n🟡 LADs in GeoJSON but missing in input.json ({len(missing)}):")
+for code in sorted(missing):
+    print(f"  {code} → geojson: {geojson_name_map.get(code)}")
+
+print(f"\n🔴 LADs in input.json but not in GeoJSON ({len(extra)}):")
+for code in sorted(extra):
+    print(f"  {code} → input.json: {input_name_map.get(code)}")

uk_bin_collection/map.html

@@ -24,94 +24,90 @@
       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);
-            }
+    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;
           }
+        };
 
-          // 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 };
-                }
-              }
-            }
-          }
+        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';
+              }
 
-        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`);
-                }
+              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);
-
-            // 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));
+            }
+          }).addTo(map);
+        });
+    })
+    .catch(err => console.error('❌ Error loading data:', err));
   </script>
 </body>
 

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/tests/input.json

@@ -1013,7 +1013,8 @@
             "N09000010",
             "S12000005",
             "S12000045",
-            "W06000020"
+            "W06000020",
+            "E07000122"
         ]
     },
     "GraveshamBoroughCouncil": {

{uk_bin_collection-0.146.1.dist-info → uk_bin_collection-0.147.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: uk_bin_collection
-Version: 0.146.1
+Version: 0.147.0
 Summary: Python Lib to collect UK Bin Data
 Author: Robert Bradley
 Author-email: robbrad182@gmail.com
@@ -9,6 +9,7 @@ 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
@@ -361,6 +362,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.1.dist-info → uk_bin_collection-0.147.0.dist-info}/RECORD

@@ -1,11 +1,13 @@
 uk_bin_collection/Local_Authority_Boundaries.geojson,sha256=_j-hUiL0--t2ewd_s29-j7_AKRlhagRMmOhXyco-B6I,1175922
 uk_bin_collection/README.rst,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-uk_bin_collection/map.html,sha256=qKc4Lscv1eSIc0M3vDofzZf5w9_eslEYpz1-kK4tup0,4346
+uk_bin_collection/compare_lad_codes.py,sha256=BjXPzxYbbqyl2Pv9yPip0BVpyD3GOofwgWa-BQUecqM,2214
+uk_bin_collection/map.html,sha256=1xqlWRc2g4poZwT9FVdsSAkXPmkZ3dmQeA_-ikbU9dg,4135
 uk_bin_collection/tests/check_selenium_url_in_input.json.py,sha256=lf-JT7vvaSfvgbrfOhzrhfSzJqL82WajlRqo1GqfcMM,7875
 uk_bin_collection/tests/council_feature_input_parity.py,sha256=DO6Mk4ImYgM5ZCZ-cutwz5RoYYWZRLYx2tr6zIs_9Rc,3843
 uk_bin_collection/tests/features/environment.py,sha256=VQZjJdJI_kZn08M0j5cUgvKT4k3iTw8icJge1DGOkoA,127
 uk_bin_collection/tests/features/validate_council_outputs.feature,sha256=SJK-Vc737hrf03tssxxbeg_JIvAH-ddB8f6gU1LTbuQ,251
-uk_bin_collection/tests/input.json,sha256=hJ_W7-yiUwGRA2V9WVQVXCV3UfaBFfbdaIbxm3c7hIM,133302
+uk_bin_collection/tests/generate_map_test_results.py,sha256=8KjfNWNd44eGhiQMDJejoVzTh9dckGHikZQfwJgNO3w,1141
+uk_bin_collection/tests/input.json,sha256=-EVTLbgBwk879YMbAHkIYC7svXffzlL8xOa8Tab8M7g,133327
 uk_bin_collection/tests/output.schema,sha256=ZwKQBwYyTDEM4G2hJwfLUVM-5v1vKRvRK9W9SS1sd18,1086
 uk_bin_collection/tests/step_defs/step_helpers/file_handler.py,sha256=Ygzi4V0S1MIHqbdstUlIqtRIwnynvhu4UtpweJ6-5N8,1474
 uk_bin_collection/tests/step_defs/test_validate_council.py,sha256=VZ0a81sioJULD7syAYHjvK_-nT_Rd36tUyzPetSA0gk,3475
@@ -332,8 +334,8 @@ uk_bin_collection/uk_bin_collection/councils/YorkCouncil.py,sha256=I2kBYMlsD4bId
 uk_bin_collection/uk_bin_collection/councils/council_class_template/councilclasstemplate.py,sha256=QD4v4xpsEE0QheR_fGaNOIRMc2FatcUfKkkhAhseyVU,1159
 uk_bin_collection/uk_bin_collection/create_new_council.py,sha256=m-IhmWmeWQlFsTZC4OxuFvtw5ZtB8EAJHxJTH4O59lQ,1536
 uk_bin_collection/uk_bin_collection/get_bin_data.py,sha256=YvmHfZqanwrJ8ToGch34x-L-7yPe31nB_x77_Mgl_vo,4545
-uk_bin_collection-0.146.1.dist-info/LICENSE,sha256=vABBUOzcrgfaTKpzeo-si9YVEun6juDkndqA8RKdKGs,1071
-uk_bin_collection-0.146.1.dist-info/METADATA,sha256=Q2CxbBh-CbGhd-HLj-lH0U3mDLxZWv3JgBXKMvaWNh0,19858
-uk_bin_collection-0.146.1.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-uk_bin_collection-0.146.1.dist-info/entry_points.txt,sha256=36WCSGMWSc916S3Hi1ZkazzDKHaJ6CD-4fCEFm5MIao,90
-uk_bin_collection-0.146.1.dist-info/RECORD,,
+uk_bin_collection-0.147.0.dist-info/LICENSE,sha256=vABBUOzcrgfaTKpzeo-si9YVEun6juDkndqA8RKdKGs,1071
+uk_bin_collection-0.147.0.dist-info/METADATA,sha256=0ub11DJ2h8YO2rfIqeLVzLAb9rAGJkU33VoMPKdgX-s,20956
+uk_bin_collection-0.147.0.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+uk_bin_collection-0.147.0.dist-info/entry_points.txt,sha256=36WCSGMWSc916S3Hi1ZkazzDKHaJ6CD-4fCEFm5MIao,90
+uk_bin_collection-0.147.0.dist-info/RECORD,,