rename from/to coordinate_string -> points

ocrd/model/ocrd_xml_base.py

@@ -4,8 +4,8 @@
 )
 from ocrd.utils import (
     xmllint_format,
-    xywh_from_coordinate_string,
-    coordinate_string_from_xywh
+    xywh_from_points,
+    points_from_xywh
 )
 
 from lxml import etree as ET
@@ -22,14 +22,14 @@ def get_coords(el):
     coords = el.find('page:Coords', NAMESPACES)
     if coords is not None:
         points = coords.get('points')
-        return xywh_from_coordinate_string(points)
+        return xywh_from_points(points)
 
 def set_coords(el, box):
     if box is not None:
         coords = el.find('page:Coords', NAMESPACES)
         if coords is None:
             coords = ET.SubElement(el, TAG_PAGE_COORDS)
-        coords.set("points", coordinate_string_from_xywh(box))
+        coords.set("points", points_from_xywh(box))
 
 class OcrdXmlDocument(object):
 

ocrd/utils.py

@@ -10,7 +10,7 @@
 def getLogger(*args, **kwargs):
     return logging.getLogger(*args, **kwargs)
 
-def coordinate_string_from_xywh(box):
+def points_from_xywh(box):
     """
     Constructs a polygon representation from a rectangle described as a dict with keys x, y, w, h.
     """
@@ -26,7 +26,7 @@ def coordinate_string_from_xywh(box):
         box['y'] + box['h']
     )
 
-def xywh_from_coordinate_string(points):
+def xywh_from_points(points):
     """
     Constructs a numpy-compatible polygon from a page representation.
     """