Co-authored-by: Nik weinni2000@gmail.com

Author: weinni2000

base_geoengine/README.rst

@@ -76,9 +76,7 @@ The module also requires two additional python libs:
 - `geojson <http://pypi.python.org/pypi/geojson>`__
 
 When you will install the module this two additional libs will be
-installed.
-
-For a complete documentation please refer to the `public
+installed. For a complete documentation please refer to the `public
 documenation <http://oca.github.io/geospatial/index.html>`__
 
 Usage

base_geoengine/__pycache__/__init__.cpython-310.pyc

@@ -13,7 +13,7 @@
 import string
 from operator import attrgetter
 
-from odoo import fields
+from odoo import _, fields
 from odoo.fields import Domain
 from odoo.models import BaseModel
 from odoo.orm.fields import Field
@@ -281,7 +281,7 @@ def entry_to_shape(self, value, same_type=False):
         shape = convert.value_to_shape(value)
         if same_type and not shape.is_empty:
             if shape.geom_type.lower() != self.geo_type.lower():
-                msg = self.env._(
+                msg = _(
                     "Geo Value %(geom_type)s must be of the same type %(geo_type)s \
                         as fields",
                     geom_type=shape.geom_type.lower(),
@@ -301,14 +301,14 @@ def update_geo_db_column(self, model):
         check_data = cr.fetchone()
         if not check_data:
             raise TypeError(
-                self.env._(
+                _(
                     "geometry_columns table seems to be corrupted."
                     " SRID check is not possible"
                 )
             )
         if check_data[0] != self.srid:
             raise TypeError(
-                self.env._(
+                _(
                     "Reprojection of column is not implemented."
                     " We can not change srid %(srid)s to %(data)s",
                     srid=self.srid,
@@ -317,7 +317,7 @@ def update_geo_db_column(self, model):
             )
         elif check_data[1] != self.geo_type.upper():
             raise TypeError(
-                self.env._(
+                _(
                     "Geo type modification is not implemented."
                     " We can not change type %(data)s to %(geo_type)s",
                     data=check_data[1],
@@ -326,7 +326,7 @@ def update_geo_db_column(self, model):
             )
         elif check_data[2] != self.dim:
             raise TypeError(
-                self.env._(
+                _(
                     "Geo dimention modification is not implemented."
                     " We can not change dimention %(data)s to %(dim)s",
                     data=check_data[2],

base_geoengine/__pycache__/domains.cpython-310.pyc

@@ -2,22 +2,27 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 import logging
 
+from shapely.errors import GEOSException
+
 from odoo import _
 
-logger = logging.getLogger(__name__)
+_logger = logging.getLogger(__name__)
 
 try:
     import geojson
     from shapely import wkb, wkt
     from shapely.geometry import shape
     from shapely.geometry.base import BaseGeometry
 except ImportError:
-    logger = logging.getLogger(__name__)
-    logger.warning(_("Shapely or geojson are not available in the sys path"))  # pylint: disable=prefer-env-translation
+    _logger.warning(_("Shapely or geojson are not available in the sys path"))  # pylint: disable=prefer-env-translation
 
 
 def value_to_shape(value, use_wkb=False):
     """Transforms input into a Shapely object"""
+
+    # always use_wkb for now
+    use_wkb = True
+
     if not value:
         return wkt.loads("GEOMETRYCOLLECTION EMPTY")
     if isinstance(value, str):
@@ -26,19 +31,35 @@ def value_to_shape(value, use_wkb=False):
         if "{" in value:
             geo_dict = geojson.loads(value)
             return shape(geo_dict)
-        elif use_wkb:
-            return wkb.loads(value, hex=True)
-        else:
-            # <NIKMOD>
-            # 'POINT(0.0 0.0)'
-
+        if use_wkb:
             try:
-                return wkt.loads(value)
+                res = wkb.loads(value, hex=True)
+                return res
+            except GEOSException as e:
+                _logger.warning("GEOSException:")
+                _logger.warning(e)
             except Exception as e:
-                logger.warning(_("Failed to parse WKT: %s", e))  # pylint: disable=prefer-env-translation
-                empty = "POINT(0.0 0.0)"
-                return wkt.loads(empty)
-                # </NIKMOD>
+                _logger.warning("WKB conversion failed:")
+                _logger.warning(e)
+        # elif len(value) == 42 and "POINT" not in value and "(" not in value:
+        # not clear why use_wkb is not set correctly anymore.
+        # if a record is stored it's instantly
+        # executed again with the hash value
+        # The hash value eg "0101000000A4703D0AD7232C400AD7A3703D0A4840"
+        # is also possible, but we do not handle it now.
+        #        value = wkb.loads(value, hex=True)
+        #        return value
+        # <NIKMOD>
+        # 'POINT(0.0 0.0)'
+        try:
+            return wkt.loads(value)
+        except Exception as e:
+            # error = _("Failed to parse WKT: %(e)s") % {"e":e}
+            error = f"Failed to parse WKT: {e}"
+            _logger.warning(error)  # pylint: disable=prefer-env-translation
+            empty = "POINT(0 0)"
+            return wkt.loads(empty)
+            # </NIKMOD>
     elif hasattr(value, "wkt"):
         return value if isinstance(value, BaseGeometry) else wkt.loads(value.wkt)
     else: