0001-templates-add-dict-support-to-distance-43296.patch

Frédéric Péters, 26 mai 2020 11:27

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

Subject: [PATCH] templates: add dict support to |distance (#43296)

 tests/test_templates.py           |  2 ++
 wcs/qommon/templatetags/qommon.py | 22 ++++++++++++++++------
 2 files changed, 18 insertions(+), 6 deletions(-)

         assert t.render({'coords': '48.1;2.1'}) == '13387.2'
         t = Template('{{ c1|distance:c2|floatformat }}',)
         assert t.render({'c1': '48;2', 'c2': '48.1;2.1'}) == '13387.2'
         assert t.render({'c1': {'lat': '48', 'lon': '2'}, 'c2': {'lat': '48.1', 'lng': '2.1'}}) == '13387.2'
         assert t.render({'c1': {'lat': '48', 'lng': '2'}, 'c2': {'lat': '48.1', 'lng': '2.1'}}) == '13387.2'
         class MockFormData(object):
             formdef = None

             return None, None
         if hasattr(obj, 'get_value'):
             obj = obj.get_value()  # unlazy
         if not obj or not isinstance(obj, six.string_types) or ';' not in obj:
             return None, None
         try:
             return float(obj.split(';')[0]), float(obj.split(';')[1])
         except ValueError:
             return None, None
         if isinstance(obj, dict) and 'lat' in obj and 'lon' in obj:
             try:
                 return float(obj['lat']), float(obj['lon'])
             except (TypeError, ValueError):
                 pass
         if isinstance(obj, dict) and 'lat' in obj and 'lng' in obj:
             try:
                 return float(obj['lat']), float(obj['lng'])
             except (TypeError, ValueError):
                 pass
         if isinstance(obj, six.string_types) and ';' in obj:
             try:
                 return float(obj.split(';')[0]), float(obj.split(';')[1])
             except ValueError:
                 pass
         return None, None
     @register.filter
+    -

Projet

Général

Profil

Produits Entr'ouvert » w.c.s.

0001-templates-add-dict-support-to-distance-43296.patch