diff --git a/spp_registrant_gis/README.rst b/spp_registrant_gis/README.rst
index e9eac9fb2..c63c47eeb 100644
--- a/spp_registrant_gis/README.rst
+++ b/spp_registrant_gis/README.rst
@@ -83,6 +83,16 @@ Dependencies
Changelog
=========
+19.0.2.1.0
+~~~~~~~~~~
+
+- feat(registrant_gis): show Latitude and Longitude as editable fields
+ on the registrant and group forms, kept in sync with the map
+ coordinates in both directions. Values outside ±90 / ±180 are refused
+ — including on import — so an impossible coordinate can no longer be
+ stored and then break the map widget every time the record is opened,
+ with no way to correct it (#1143)
+
19.0.2.0.0
~~~~~~~~~~
diff --git a/spp_registrant_gis/__manifest__.py b/spp_registrant_gis/__manifest__.py
index 93263160a..813f44344 100644
--- a/spp_registrant_gis/__manifest__.py
+++ b/spp_registrant_gis/__manifest__.py
@@ -2,7 +2,7 @@
{
"name": "OpenSPP Registrant GIS",
"category": "OpenSPP",
- "version": "19.0.2.0.0",
+ "version": "19.0.2.1.0",
"sequence": 1,
"author": "OpenSPP.org",
"website": "https://github.com/OpenSPP/OpenSPP2",
diff --git a/spp_registrant_gis/models/res_partner.py b/spp_registrant_gis/models/res_partner.py
index 1ba8b3ad1..0aeae4160 100644
--- a/spp_registrant_gis/models/res_partner.py
+++ b/spp_registrant_gis/models/res_partner.py
@@ -1,5 +1,13 @@
# Part of OpenSPP. See LICENSE file for full copyright and licensing details.
-from odoo import fields, models
+import json
+
+from odoo import _, api, fields, models
+from odoo.exceptions import ValidationError
+
+#: WGS84 bounds. Anything outside these is not a place on Earth, and the map
+#: widget cannot project it — see _check_gis_lat_long.
+LATITUDE_RANGE = (-90.0, 90.0)
+LONGITUDE_RANGE = (-180.0, 180.0)
class ResPartner(models.Model):
@@ -12,3 +20,81 @@ class ResPartner(models.Model):
help="Geographic coordinates (latitude/longitude) for spatial queries and mapping. "
"Used for proximity-based targeting and geographic analysis of registrants.",
)
+ # OP#1143: plain latitude/longitude inputs kept in sync with `coordinates`
+ # so the values can be entered (registry create, change requests) and
+ # imported without needing the MapTiler map widget configured. Editing the
+ # map updates these; editing these rebuilds the point.
+ gis_latitude = fields.Float(
+ string="Latitude",
+ digits=(9, 6),
+ compute="_compute_gis_lat_long",
+ inverse="_inverse_gis_lat_long",
+ store=True,
+ help="Latitude in decimal degrees (WGS84). Kept in sync with GPS Coordinates.",
+ )
+ gis_longitude = fields.Float(
+ string="Longitude",
+ digits=(9, 6),
+ compute="_compute_gis_lat_long",
+ inverse="_inverse_gis_lat_long",
+ store=True,
+ help="Longitude in decimal degrees (WGS84). Kept in sync with GPS Coordinates.",
+ )
+
+ @api.depends("coordinates")
+ def _compute_gis_lat_long(self):
+ """Derive latitude/longitude from the point geometry (x=lon, y=lat)."""
+ for rec in self:
+ geom = rec.coordinates
+ if geom and not geom.is_empty and getattr(geom, "geom_type", None) == "Point":
+ rec.gis_longitude = geom.x
+ rec.gis_latitude = geom.y
+ else:
+ rec.gis_longitude = 0.0
+ rec.gis_latitude = 0.0
+
+ def _inverse_gis_lat_long(self):
+ """Rebuild the point geometry when latitude/longitude are entered.
+
+ Both values are taken from the record, so filling either field commits
+ the current pair. (0, 0) is treated as "unset" and clears the point.
+ """
+ for rec in self:
+ if rec.gis_latitude or rec.gis_longitude:
+ rec.coordinates = json.dumps({"type": "Point", "coordinates": [rec.gis_longitude, rec.gis_latitude]})
+ else:
+ rec.coordinates = False
+
+ @api.constrains("gis_latitude", "gis_longitude", "coordinates")
+ def _check_gis_lat_long(self):
+ """Refuse coordinates that are not a place on Earth (OP#1143 QA round 1).
+
+ Without this the value was stored, and the MapTiler widget then threw
+ ``Cannot read properties of undefined`` while projecting the point —
+ on mouseover, so it fired again on every reopen and the field could not
+ be corrected. Rejecting the write keeps the last good value and leaves
+ the user on the form to fix their typo.
+
+ Constrained on ``coordinates`` too, so a point arriving from an import
+ or from another module writing the geometry directly is checked on the
+ same terms as one typed into the form.
+ """
+ for rec in self:
+ if not LATITUDE_RANGE[0] <= rec.gis_latitude <= LATITUDE_RANGE[1]:
+ raise ValidationError(
+ _(
+ "Latitude must be between %(low)s and %(high)s degrees; got %(value)s.",
+ low=LATITUDE_RANGE[0],
+ high=LATITUDE_RANGE[1],
+ value=rec.gis_latitude,
+ )
+ )
+ if not LONGITUDE_RANGE[0] <= rec.gis_longitude <= LONGITUDE_RANGE[1]:
+ raise ValidationError(
+ _(
+ "Longitude must be between %(low)s and %(high)s degrees; got %(value)s.",
+ low=LONGITUDE_RANGE[0],
+ high=LONGITUDE_RANGE[1],
+ value=rec.gis_longitude,
+ )
+ )
diff --git a/spp_registrant_gis/readme/HISTORY.md b/spp_registrant_gis/readme/HISTORY.md
index 4aaf9afef..d93667c01 100644
--- a/spp_registrant_gis/readme/HISTORY.md
+++ b/spp_registrant_gis/readme/HISTORY.md
@@ -1,3 +1,7 @@
+### 19.0.2.1.0
+
+- feat(registrant_gis): show Latitude and Longitude as editable fields on the registrant and group forms, kept in sync with the map coordinates in both directions. Values outside ±90 / ±180 are refused — including on import — so an impossible coordinate can no longer be stored and then break the map widget every time the record is opened, with no way to correct it (#1143)
+
### 19.0.2.0.0
- Initial migration to OpenSPP2
diff --git a/spp_registrant_gis/static/description/index.html b/spp_registrant_gis/static/description/index.html
index 0184f130f..c082203c7 100644
--- a/spp_registrant_gis/static/description/index.html
+++ b/spp_registrant_gis/static/description/index.html
@@ -442,6 +442,17 @@
+
19.0.2.1.0
+
+- feat(registrant_gis): show Latitude and Longitude as editable fields
+on the registrant and group forms, kept in sync with the map
+coordinates in both directions. Values outside ±90 / ±180 are refused
+— including on import — so an impossible coordinate can no longer be
+stored and then break the map widget every time the record is opened,
+with no way to correct it (#1143)
+
+
19.0.2.0.0
- Initial migration to OpenSPP2
diff --git a/spp_registrant_gis/tests/test_registrant_gis.py b/spp_registrant_gis/tests/test_registrant_gis.py
index c815820e2..728c47fc7 100644
--- a/spp_registrant_gis/tests/test_registrant_gis.py
+++ b/spp_registrant_gis/tests/test_registrant_gis.py
@@ -1,6 +1,7 @@
# Part of OpenSPP. See LICENSE file for full copyright and licensing details.
import json
+from odoo.exceptions import ValidationError
from odoo.tests import TransactionCase
@@ -79,3 +80,83 @@ def test_coordinates_empty_by_default(self):
# Coordinates should be False/empty by default
self.assertFalse(registrant.coordinates)
+
+ # ── OP#1143: visible latitude/longitude inputs synced with coordinates ──
+ def test_lat_long_computed_from_coordinates(self):
+ """Setting coordinates populates the latitude/longitude inputs."""
+ registrant = self.partner_model.create({"name": "LatLong From Point", "is_registrant": True})
+ registrant.write({"coordinates": json.dumps({"type": "Point", "coordinates": [121.5, 14.25]})})
+ self.assertAlmostEqual(registrant.gis_longitude, 121.5, places=5)
+ self.assertAlmostEqual(registrant.gis_latitude, 14.25, places=5)
+
+ def test_coordinates_built_from_lat_long(self):
+ """Typing latitude/longitude rebuilds the coordinates point."""
+ group = self.partner_model.create({"name": "LatLong Group", "is_registrant": True, "is_group": True})
+ group.write({"gis_latitude": 8.5, "gis_longitude": 124.75})
+ self.assertTrue(group.coordinates)
+ self.assertAlmostEqual(group.coordinates.x, 124.75, places=5) # x = longitude
+ self.assertAlmostEqual(group.coordinates.y, 8.5, places=5) # y = latitude
+
+ def test_lat_long_empty_when_no_coordinates(self):
+ """With no point set, the latitude/longitude inputs read as 0."""
+ registrant = self.partner_model.create({"name": "No Coords", "is_registrant": True})
+ self.assertEqual(registrant.gis_latitude, 0.0)
+ self.assertEqual(registrant.gis_longitude, 0.0)
+
+ # ── OP#1143 QA round 1: out-of-range values must be refused ──
+ def test_latitude_out_of_range_is_refused(self):
+ """QA round 1: an impossible latitude was accepted and stored.
+
+ The map widget then threw a JavaScript error while projecting the point
+ and kept throwing on every reopen, so the bad value could not be
+ corrected. Reject it on write instead, where the user still has the
+ form in front of them.
+ """
+ registrant = self.partner_model.create({"name": "Bad Latitude", "is_registrant": True})
+ with self.assertRaises(ValidationError):
+ registrant.write({"gis_latitude": 999.0, "gis_longitude": 120.0})
+
+ def test_longitude_out_of_range_is_refused(self):
+ registrant = self.partner_model.create({"name": "Bad Longitude", "is_registrant": True})
+ with self.assertRaises(ValidationError):
+ registrant.write({"gis_latitude": 10.0, "gis_longitude": 5000.0})
+
+ def test_negative_out_of_range_is_refused(self):
+ """The range is two-sided: -91 is as invalid as 91."""
+ registrant = self.partner_model.create({"name": "Negative Bad", "is_registrant": True})
+ with self.assertRaises(ValidationError):
+ registrant.write({"gis_latitude": -91.0, "gis_longitude": 0.0})
+ with self.assertRaises(ValidationError):
+ registrant.write({"gis_latitude": 0.0, "gis_longitude": -181.0})
+
+ def test_range_boundaries_are_accepted(self):
+ """The poles and the antimeridian are legitimate coordinates."""
+ registrant = self.partner_model.create({"name": "Boundary", "is_registrant": True})
+ registrant.write({"gis_latitude": 90.0, "gis_longitude": 180.0})
+ self.assertAlmostEqual(registrant.gis_latitude, 90.0, places=5)
+ registrant.write({"gis_latitude": -90.0, "gis_longitude": -180.0})
+ self.assertAlmostEqual(registrant.gis_longitude, -180.0, places=5)
+
+ def test_out_of_range_point_from_import_is_refused(self):
+ """Import writes `coordinates` directly, bypassing the typed inputs."""
+ registrant = self.partner_model.create({"name": "Bad Import", "is_registrant": True})
+ with self.assertRaises(ValidationError):
+ registrant.write({"coordinates": json.dumps({"type": "Point", "coordinates": [200.0, 95.0]})})
+
+ def test_a_refused_value_leaves_the_record_correctable(self):
+ """The point of the fix: the bad value must not be persisted.
+
+ QA could not recover because the invalid coordinate had been saved and
+ crashed the widget on every reopen.
+ """
+ registrant = self.partner_model.create({"name": "Recoverable", "is_registrant": True})
+ registrant.write({"gis_latitude": 8.5, "gis_longitude": 124.75})
+
+ with self.assertRaises(ValidationError):
+ registrant.write({"gis_latitude": 999.0})
+ registrant.invalidate_recordset()
+
+ # The good value survived, and a correction still goes through.
+ self.assertAlmostEqual(registrant.gis_latitude, 8.5, places=5)
+ registrant.write({"gis_latitude": 9.0})
+ self.assertAlmostEqual(registrant.gis_latitude, 9.0, places=5)
diff --git a/spp_registrant_gis/views/res_partner_views.xml b/spp_registrant_gis/views/res_partner_views.xml
index 5a258a565..3bed3464e 100644
--- a/spp_registrant_gis/views/res_partner_views.xml
+++ b/spp_registrant_gis/views/res_partner_views.xml
@@ -14,6 +14,11 @@
>
+
+
+
@@ -33,6 +38,11 @@
>
+
+
+