Improve logic for identifying photos in csv-normaliser

Readme.md

@@ -35,7 +35,7 @@ The "short" named is created by taking the electorate name and removing the word
 The file can be generated using the `jq` tool and the VEC data:
 
 ```
-jq '[.[] | {name: .electorateName, electorateId: .electorateId, shortName: .parentElectorateName | match("(.*?)(?:(?: Rural)?(?: City| Shire) Council)").captures[0].string, parentElectorateId: .parentElectorateId, councilName: .parentElectorateName }] | group_by(.parentElectorateId) | map({shortName: .[0].shortName, slug: .[0].shortName | ascii_downcase | split(" ") | join("-"), councilName: .[0].councilName, wardNames: . | map(.name) }) | sort_by(.shortName)' "VEC Data\wards.json" > council_names.json
+jq '[.[] | {name: .electorateName, electorateId: .electorateId, shortName: .parentElectorateName | match("(.*?)(?:(?: Rural)?(?: City| Shire| Borough) Council)").captures[0].string, parentElectorateId: .parentElectorateId, councilName: .parentElectorateName }] | group_by(.parentElectorateId) | map({shortName: .[0].shortName, slug: .[0].shortName | ascii_downcase | split(" ") | join("-"), councilName: .[0].councilName, wardNames: . | map(.name) }) | sort_by(.shortName)' "VEC Data\wards.json" > council_names.json
 ```
 
 ## lga-links-filter

council_names.json

@@ -786,6 +786,14 @@
       "Beaufort"
     ]
   },
+  {
+    "shortName": "Queenscliffe",
+    "slug": "queenscliffe",
+    "councilName": "Queenscliffe Borough Council",
+    "wardNames": [
+      "Unsubdivided"
+    ]
+  },
   {
     "shortName": "South Gippsland",
     "slug": "south-gippsland",

csv-normaliser/main.php

@@ -96,19 +96,23 @@ if (($handle = fopen($inputFile, "r")) !== FALSE) {
 
             //print("Adding candidate " . $candidateName . " to ". $currentWard . "\n");
 
-            $name_split = explode(" ", str_replace(",", "", str_replace("'", "_", $data[1])));
+            $name_split = array_values(array_filter(explode(" ", str_replace(",", "", str_replace("'", "_", $data[1]))), function($value) { return !is_null($value) && $value !== ''; }));
 
             $name_patterns = [
-                implode(".*", $name_split),
+                ".*" . implode(".*", $name_split) . ".*",
-                implode(".*", array_reverse($name_split)),
+                ".*" . implode(".*", array_reverse($name_split)) . ".*",
+                "^" . $name_split[array_key_last($name_split)] . ".*",
+                "^" . $name_split[0] . ".*"
             ];
 
-            $regex_groups = array_map(function($x) { return "(?:.*" . $x . ".*)"; }, $name_patterns);
+            $regex_groups = array_map(function($x) { return "(?:" . $x . ")"; }, $name_patterns);
 
             $regex_pattern = "/" . implode("|", $regex_groups) . "/i";
 
             $picture = "";
             foreach ($mediaFiles as $mediaFile) {
+                if ($mediaFile == ".") continue;
+                if ($mediaFile == "..") continue;
                 if (preg_match($regex_pattern, $mediaFile)) {
                     $picture = $mediaFile;
                     break;

map-generator/dist/main.js

@@ -16,7 +16,7 @@
   \****************/
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
-eval("__webpack_require__.r(__webpack_exports__);\n/* harmony import */ var polylabel__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! polylabel */ \"./node_modules/polylabel/polylabel.js\");\n\r\n\r\nfunction normaliseCouncilName(str) {\r\n    const regex = /(.*?)(?:(?: Rural)?(?: City| Shire) Council)/g;\r\n    const matches = str.matchAll(regex);\r\n\r\n    // If we get a match, convert to slug format\r\n    for (const match of matches) {\r\n        return match[1].toLowerCase().replace(\" \", \"-\");\r\n    }\r\n\r\n    // If we didn't find any matches, try convert input to slug format\r\n    return str.toLowerCase().replace(\" \", \"-\");\r\n};\r\n\r\nconst searchParams = new URLSearchParams(window.location.search);\r\nconst councilName = normaliseCouncilName(searchParams.get(\"council\"));\r\nconsole.log(councilName);\r\n\r\nmapboxgl.accessToken = 'pk.eyJ1IjoibWF0dHl3YXkiLCJhIjoiY2x6eG9vMzZyMHY2cDJqb3M1ODZnNjF4cyJ9.IX8CfYQZUaQhSjWgMXmsEA';\r\nconst map = new mapboxgl.Map({\r\n    container: 'map',\r\n    zoom: 10,\r\n    style: 'mapbox://styles/mattyway/cm03vw57q00fd01pn93wf2j7p',\r\n    center: [145.00724,-37.79011]\r\n});\r\n\r\nmap.on('load', () => {\r\n    // Load an image from an external URL.\r\n    map.loadImage('circle.png', (error, image) => {\r\n        if (error) throw error;\r\n\r\n        map.addImage('blue-circle', image);\r\n\r\n        fetch(\"wards_withboundaries.json\")\r\n            .then(response => {\r\n                response.json()\r\n                    .then((wardData) => {\r\n                        const filteredWardData = wardData.filter((ward) => normaliseCouncilName(ward.parentElectorateName) == councilName);\r\n\r\n                        var bounds = {\r\n                            \"west\": undefined,\r\n                            \"south\": undefined,\r\n                            \"east\": undefined,\r\n                            \"north\": undefined\r\n                        }\r\n\r\n                        function addToBounds(coordinate) {\r\n                            if (bounds.west == undefined || coordinate[0] < bounds.west) {\r\n                                bounds.west = coordinate[0];\r\n                            }\r\n\r\n                            if (bounds.south == undefined || coordinate[1] < bounds.south) {\r\n                                bounds.south = coordinate[1];\r\n                            }\r\n\r\n                            if (bounds.east == undefined || coordinate[0] > bounds.east) {\r\n                                bounds.east = coordinate[0];\r\n                            }\r\n\r\n                            if (bounds.north == undefined || coordinate[1] > bounds.north) {\r\n                                bounds.north = coordinate[1];\r\n                            }\r\n                        }\r\n\r\n                        var labelFeatures = [];\r\n\r\n                        filteredWardData.forEach(wardData => {\r\n                            const featureCollection = {\r\n                                'type': 'FeatureCollection',\r\n                                'features': [\r\n                                    {\r\n                                        'type': 'Feature',\r\n                                        'geometry': JSON.parse(wardData.boundaryJson)\r\n                                    }\r\n                                ]\r\n                            };\r\n\r\n                            if (featureCollection.features[0].geometry.type == \"Polygon\") {\r\n                                featureCollection.features[0].geometry.coordinates[0].forEach(coordinate => {\r\n                                    addToBounds(coordinate);\r\n                                });\r\n                            }\r\n                            if (featureCollection.features[0].geometry.type == \"MultiPolygon\") {\r\n                                featureCollection.features[0].geometry.coordinates.forEach(polygon => {\r\n                                    polygon[0].forEach(coordinate => {\r\n                                        addToBounds(coordinate);\r\n                                    });\r\n                                });\r\n                            }\r\n\r\n                            // Add data\r\n                            map.addSource(\"data_\"+wardData.electorateId, {\r\n                                'type': 'geojson',\r\n                                'data': featureCollection\r\n                            });\r\n\r\n                            // Add a line along the data\r\n                            map.addLayer({\r\n                                'id': \"outline_\"+wardData.electorateId,\r\n                                'type': 'line',\r\n                                'source': \"data_\"+wardData.electorateId,\r\n                                'layout': {},\r\n                                'paint': {\r\n                                    'line-color':Line truncated
+eval("__webpack_require__.r(__webpack_exports__);\n/* harmony import */ var polylabel__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! polylabel */ \"./node_modules/polylabel/polylabel.js\");\n\r\n\r\nfunction normaliseCouncilName(str) {\r\n    const regex = /(.*?)(?:(?: Rural)?(?: City| Shire| Borough) Council)/g;\r\n    const matches = str.matchAll(regex);\r\n\r\n    // If we get a match, convert to slug format\r\n    for (const match of matches) {\r\n        return match[1].toLowerCase().replace(\" \", \"-\");\r\n    }\r\n\r\n    // If we didn't find any matches, try convert input to slug format\r\n    return str.toLowerCase().replace(\" \", \"-\");\r\n};\r\n\r\nconst searchParams = new URLSearchParams(window.location.search);\r\nconst councilName = normaliseCouncilName(searchParams.get(\"council\"));\r\nconsole.log(councilName);\r\n\r\nmapboxgl.accessToken = 'pk.eyJ1IjoibWF0dHl3YXkiLCJhIjoiY2x6eG9vMzZyMHY2cDJqb3M1ODZnNjF4cyJ9.IX8CfYQZUaQhSjWgMXmsEA';\r\nconst map = new mapboxgl.Map({\r\n    container: 'map',\r\n    zoom: 10,\r\n    style: 'mapbox://styles/mattyway/cm03vw57q00fd01pn93wf2j7p',\r\n    center: [145.00724,-37.79011]\r\n});\r\n\r\nmap.on('load', () => {\r\n    // Load an image from an external URL.\r\n    map.loadImage('circle.png', (error, image) => {\r\n        if (error) throw error;\r\n\r\n        map.addImage('blue-circle', image);\r\n\r\n        fetch(\"wards_withboundaries.json\")\r\n            .then(response => {\r\n                response.json()\r\n                    .then((wardData) => {\r\n                        const filteredWardData = wardData.filter((ward) => normaliseCouncilName(ward.parentElectorateName) == councilName);\r\n\r\n                        var bounds = {\r\n                            \"west\": undefined,\r\n                            \"south\": undefined,\r\n                            \"east\": undefined,\r\n                            \"north\": undefined\r\n                        }\r\n\r\n                        function addToBounds(coordinate) {\r\n                            if (bounds.west == undefined || coordinate[0] < bounds.west) {\r\n                                bounds.west = coordinate[0];\r\n                            }\r\n\r\n                            if (bounds.south == undefined || coordinate[1] < bounds.south) {\r\n                                bounds.south = coordinate[1];\r\n                            }\r\n\r\n                            if (bounds.east == undefined || coordinate[0] > bounds.east) {\r\n                                bounds.east = coordinate[0];\r\n                            }\r\n\r\n                            if (bounds.north == undefined || coordinate[1] > bounds.north) {\r\n                                bounds.north = coordinate[1];\r\n                            }\r\n                        }\r\n\r\n                        var labelFeatures = [];\r\n\r\n                        filteredWardData.forEach(wardData => {\r\n                            const featureCollection = {\r\n                                'type': 'FeatureCollection',\r\n                                'features': [\r\n                                    {\r\n                                        'type': 'Feature',\r\n                                        'geometry': JSON.parse(wardData.boundaryJson)\r\n                                    }\r\n                                ]\r\n                            };\r\n\r\n                            if (featureCollection.features[0].geometry.type == \"Polygon\") {\r\n                                featureCollection.features[0].geometry.coordinates[0].forEach(coordinate => {\r\n                                    addToBounds(coordinate);\r\n                                });\r\n                            }\r\n                            if (featureCollection.features[0].geometry.type == \"MultiPolygon\") {\r\n                                featureCollection.features[0].geometry.coordinates.forEach(polygon => {\r\n                                    polygon[0].forEach(coordinate => {\r\n                                        addToBounds(coordinate);\r\n                                    });\r\n                                });\r\n                            }\r\n\r\n                            // Add data\r\n                            map.addSource(\"data_\"+wardData.electorateId, {\r\n                                'type': 'geojson',\r\n                                'data': featureCollection\r\n                            });\r\n\r\n                            // Add a line along the data\r\n                            map.addLayer({\r\n                                'id': \"outline_\"+wardData.electorateId,\r\n                                'type': 'line',\r\n                                'source': \"data_\"+wardData.electorateId,\r\n                                'layout': {},\r\n                                'paint': {\r\n                                    'linLine truncated
 
 /***/ }),
 

map-generator/src.js

@@ -1,7 +1,7 @@
 import polylabel from 'polylabel';
 
 function normaliseCouncilName(str) {
-    const regex = /(.*?)(?:(?: Rural)?(?: City| Shire) Council)/g;
+    const regex = /(.*?)(?:(?: Rural)?(?: City| Shire| Borough) Council)/g;
     const matches = str.matchAll(regex);
 
     // If we get a match, convert to slug format