Switch to an authoritative source of Spanish municipality data #114 and credit it in README #115

.idea/encodings.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding">
+    <file url="file://$PROJECT_DIR$/datafiles/MUNICIPIOS.csv" charset="ISO-8859-1" />
+  </component>
+</project>

README.md

@@ -517,7 +517,11 @@ The same approach as above is also used for alert providers.
 As well as being my work, I have also gratefully received feature patches from Steven, M1SDH.
 
 The project contains GeoJSON files for CQ and ITU zones, in the `/datafiles/` directory. These are MIT-licenced and, to
-my knowledge, created by HA8TKS for his CQ and ITU zone layers for Leaflet.
+my knowledge, created by HA8TKS for his CQ and ITU zone layers for Leaflet. `/datafiles` also contains a
+`MUNICIPIOS.csv` file, from the "Nomenclátor Geográfico de Municipios y Entidades de Población" data set sourced from
+[el Centro Nacional de Información Geográfica](https://centrodedescargas.cnig.es/CentroDescargas/home).
+`didbase-stations.csv` and the TOTA CSV files were created by me based on publicly available data from GIRO and from
+maps of conference centres.
 
 The project contains a set of flag icons generated using the "Noto Color Emoji" font on a Debian system, in the
 `/webassets/img/flags/` directory.

core/sig_utils.py

@@ -7,8 +7,10 @@ from core.cache_utils import SEMI_STATIC_URL_DATA_CACHE
 from core.constants import SIGS, HTTP_HEADERS
 from core.geo_utils import wab_wai_square_to_lat_lon
 
-with open("datafiles/dme-geodata.csv", encoding="utf-8") as _f:
+# Load Spanish municipality data for the DME programme. There's no convenient lookup API for this, so we embed the data
-    _DME_INDEX = {row["dme"]: row for row in csv.DictReader(_f)}
+# file in Spothole and load it on startup.
+with open("datafiles/MUNICIPIOS.csv", encoding="latin-1") as _f:
+    _DME_INDEX = {row["COD_INE"][:5]: row for row in csv.DictReader(_f, delimiter=";")}
 
 
 def get_ref_regex_for_sig(sig):
@@ -192,11 +194,12 @@ def populate_sig_ref_info(sig_ref):
                 except:
                     logging.debug("Invalid lat/lon received for reference")
         elif sig.upper() == "DME":
-            row = _DME_INDEX.get(ref_id)
+            # Zero-pad to 5 digits to match our source data
+            row = _DME_INDEX.get(ref_id.zfill(5))
             if row:
-                sig_ref.name = row["municipio"] + ", " + row["provincia"]
+                sig_ref.name = row["NOMBRE_ACTUAL"] + ", " + row["PROVINCIA"]
-                sig_ref.latitude = float(row["lat"]) if row.get("lat") else None
+                sig_ref.latitude = float(row["LATITUD_ETRS89_REGCAN95"].replace(",", ".")) if row.get("LATITUD_ETRS89_REGCAN95") else None
-                sig_ref.longitude = float(row["lon"]) if row.get("lon") else None
+                sig_ref.longitude = float(row["LONGITUD_ETRS89_REGCAN95"].replace(",", ".")) if row.get("LONGITUD_ETRS89_REGCAN95") else None
                 if sig_ref.latitude and sig_ref.longitude:
                     try:
                         sig_ref.grid = latlong_to_locator(sig_ref.latitude, sig_ref.longitude, 6)

templates/add_spot.html

@@ -76,7 +76,7 @@
 
 </div>
 
-<script src="/js/add-spot.js?v=1782193503"></script>
+<script src="/js/add-spot.js?v=1782239205"></script>
 <script>$(document).ready(function () {
     $("#nav-link-add-spot").addClass("active");
 }); <!-- highlight active page in nav --></script>

templates/alerts.html

@@ -75,7 +75,7 @@
 
 </div>
 
-<script src="/js/alerts.js?v=1782193504"></script>
+<script src="/js/alerts.js?v=1782239205"></script>
 <script>$(document).ready(function () {
     $("#nav-link-alerts").addClass("active");
 }); <!-- highlight active page in nav --></script>

templates/bands.html

@@ -77,8 +77,8 @@
 <script>
     let spotProvidersEnabledByDefault = {% raw json_encode(web_ui_options["spot-providers-enabled-by-default"]) %};
 </script>
-<script src="/js/spotsbandsandmap.js?v=1782193503"></script>
+<script src="/js/spotsbandsandmap.js?v=1782239205"></script>
-<script src="/js/bands.js?v=1782193503"></script>
+<script src="/js/bands.js?v=1782239205"></script>
 <script>$(document).ready(function () {
     $("#nav-link-bands").addClass("active");
 }); <!-- highlight active page in nav --></script>

templates/base.html

@@ -1,6 +1,6 @@
 {% extends "skeleton.html" %}
 {% block head_extra %}
-<link rel="stylesheet" href="/css/style.css?v=1782193503" type="text/css">
+<link rel="stylesheet" href="/css/style.css?v=1782239205" type="text/css">
 <link href="/vendor/css/bootstrap-5.3.8.min.css" rel="stylesheet">
 <link href="/vendor/css/fontawesome-6.7.2.min.css" rel="stylesheet">
 <link href="/vendor/css/solid-6.7.2.min.css" rel="stylesheet">
@@ -10,10 +10,10 @@
 <script src="/vendor/js/bootstrap-5.3.8.bundle.min.js"></script>
 <script src="/vendor/js/tinycolor2-1.6.0.min.js"></script>
 
-<script src="/js/utils.js?v=1782193503"></script>
+<script src="/js/utils.js?v=1782239205"></script>
-<script src="/js/ui-ham.js?v=1782193503"></script>
+<script src="/js/ui-ham.js?v=1782239205"></script>
-<script src="/js/geo.js?v=1782193503"></script>
+<script src="/js/geo.js?v=1782239205"></script>
-<script src="/js/common.js?v=1782193503"></script>
+<script src="/js/common.js?v=1782239205"></script>
 {% end %}
 {% block body %}
 <div class="container">

templates/conditions.html

@@ -284,7 +284,7 @@
 </div>
 
 <script src="/vendor/js/chart-4.4.9.umd.min.js"></script>
-<script src="/js/conditions.js?v=1782193503"></script>
+<script src="/js/conditions.js?v=1782239205"></script>
 <script>$(document).ready(function () {
     $("#nav-link-conditions").addClass("active");
 }); <!-- highlight active page in nav --></script>

templates/map.html

@@ -95,8 +95,8 @@
 <script>
     let spotProvidersEnabledByDefault = {% raw json_encode(web_ui_options["spot-providers-enabled-by-default"]) %};
 </script>
-<script src="/js/spotsbandsandmap.js?v=1782193504"></script>
+<script src="/js/spotsbandsandmap.js?v=1782239205"></script>
-<script src="/js/map.js?v=1782193504"></script>
+<script src="/js/map.js?v=1782239205"></script>
 <script>$(document).ready(function () {
     $("#nav-link-map").addClass("active");
 }); <!-- highlight active page in nav --></script>

templates/spots.html

@@ -116,8 +116,8 @@
 <script>
     let spotProvidersEnabledByDefault = {% raw json_encode(web_ui_options["spot-providers-enabled-by-default"]) %};
 </script>
-<script src="/js/spotsbandsandmap.js?v=1782193503"></script>
+<script src="/js/spotsbandsandmap.js?v=1782239205"></script>
-<script src="/js/spots.js?v=1782193503"></script>
+<script src="/js/spots.js?v=1782239205"></script>
 <script>$(document).ready(function () {
     $("#nav-link-spots").addClass("active");
 }); <!-- highlight active page in nav --></script>

templates/status.html

@@ -59,7 +59,7 @@
     </div>
 </div>
 
-<script src="/js/status.js?v=1782193503"></script>
+<script src="/js/status.js?v=1782239205"></script>
 <script>
     $(document).ready(function () {
         $("#nav-link-status").addClass("active");