0001-misc-add-distance-criteria-61832.patch

Frédéric Péters, 20 novembre 2022 19:34

Voir les différences: en ligne côte à côte

Subject: [PATCH 1/2] misc: add distance criteria (#61832)

 wcs/qommon/storage.py |  9 +++++++++
 wcs/sql.py            | 25 +++++++++++++++++++++++--
 2 files changed, 32 insertions(+), 2 deletions(-)

             return lambda x: False
     class Distance(Criteria):
         def __init__(self, point, distance):
             self.point = point  # {'lat': ..., 'lon': ...}
             self.distance = distance  # in meters
         def build_lambda(self):
             raise NotImplementedError()
     def parse_clause(clause):
         # creates a callable out of a clause
         #  (attribute, operator, value)

             return {}
     class Distance(wcs.qommon.storage.Distance):
         def as_sql(self):
             # simplest distance approximation <https://www.mkompf.com/gps/distcalc.html>
             return f'''(111300 * SQRT(POWER((auto_geoloc[0] - {self.point['lon']}) *
                                              COS((auto_geoloc[1] + {self.point['lat']}) / 2 * 0.01745), 2)
                                       + POWER(auto_geoloc[1] - {self.point['lat']}, 2)))
                         < {self.distance}'''
         def as_sql_param(self):
             return {}
     def get_name_as_sql_identifier(name):
         name = qommon.misc.simplify(name)
         for char in '<>|{}!?^*+/=\'':  # forbidden chars
-...
             'digests',
             'user_label',
             'prefilling_data',
             'auto_geoloc',
+        }
         # migrations
-...
         if 'prefilling_data' not in existing_fields:
             cur.execute('''ALTER TABLE %s ADD COLUMN prefilling_data bytea''' % table_name)
         if 'auto_geoloc' not in existing_fields:
             cur.execute('''ALTER TABLE %s ADD COLUMN auto_geoloc POINT''' % table_name)
         # add new fields
         for field in formdef.get_all_fields():
             assert field.id is not None
-...
             sql_dict['concerned_roles_array'] = [str(x) for x in self.concerned_roles if x]
             sql_dict['actions_roles_array'] = [str(x) for x in self.actions_roles if x]
             auto_geoloc_value = self.get_auto_geoloc()
             if auto_geoloc_value:
                 auto_geoloc_value = '(%.6f, %.6f)' % (auto_geoloc_value.get('lon'), auto_geoloc_value.get('lat'))
             sql_dict['auto_geoloc'] = auto_geoloc_value
             sql_dict.update(self.get_sql_dict_from_data(self.data, self._formdef))
             conn, cur = get_connection_and_cursor()
-...
     # latest migration, number + description (description is not used
     # programmaticaly but will make sure git conflicts if two migrations are
     # separately added with the same number)
     SQL_LEVEL = (68, 'multilinguism')
     SQL_LEVEL = (69, 'add auto_geoloc field')
     def migrate_global_views(conn, cur):
-...
                     continue
                 for formdata in formdef.data_class().select_iterator():
                     formdata._set_auto_fields(cur)  # build digests
         if sql_level < 58:
         if sql_level < 69:
             # 58: add workflow_merged_roles_dict as a jsonb column with
             #     combined formdef and formdata value.
             # 69: add auto_geoloc field to form/card tables
             from wcs.carddef import CardDef
             from wcs.formdef import FormDef
+    -

Projet

Général

Profil

Produits Entr'ouvert » w.c.s.

0001-misc-add-distance-criteria-61832.patch