Improving Python REST API

hotosm · Oct 2, 2023 · d029b1a · d029b1a
1 parent 774ae6f
commit d029b1a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/python/dbapi/api/raw.py b/python/dbapi/api/raw.py
@@ -19,7 +19,8 @@
 
 from .db import UnderpassDB
 
-RESULTS_PER_PAGE = 100
+RESULTS_PER_PAGE = 500
+RESULTS_PER_PAGE_LIST = 100
 
 # TODO: improve this code
 def tagsQueryFilter(tagsQuery, table):
@@ -181,7 +182,7 @@ def getPolygonsList(
         ) SELECT jsonb_agg(t_features.feature) as result FROM t_features;".format(
             "ST_Intersects(\"geom\", ST_GeomFromText('POLYGON(({0}))', 4326) )".format(area) if area else "1=1 ",
             "AND (" + tagsQueryFilter(tags, "ways_poly") + ")" if tags else "",
-            "ORDER BY ways_poly.timestamp DESC LIMIT " + str(RESULTS_PER_PAGE),
+            "ORDER BY ways_poly.timestamp DESC LIMIT " + str(RESULTS_PER_PAGE_LIST) + " OFFSET {0}".format(page * RESULTS_PER_PAGE_LIST) if page else "",
         )
         return self.underpassDB.run(query, responseType, True)
 
@@ -206,7 +207,7 @@ def getLinesList(
         ) SELECT jsonb_agg(t_features.feature) as result FROM t_features;".format(
             "ST_Intersects(\"geom\", ST_GeomFromText('POLYGON(({0}))', 4326) )".format(area) if area else "1=1 ",
             "AND (" + tagsQueryFilter(tags, "ways_line") + ")" if tags else "",
-            "ORDER BY ways_line.timestamp DESC LIMIT " + str(RESULTS_PER_PAGE) + " OFFSET {0}".format(page * RESULTS_PER_PAGE) if page else "",
+            "ORDER BY ways_line.timestamp DESC LIMIT " + str(RESULTS_PER_PAGE_LIST) + " OFFSET {0}".format(page * RESULTS_PER_PAGE_LIST) if page else "",
         )
         return self.underpassDB.run(query, responseType, True)
 
@@ -231,7 +232,7 @@ def getNodesList(
         ) SELECT jsonb_agg(t_features.feature) as result FROM t_features;".format(
             "ST_Intersects(\"geom\", ST_GeomFromText('POLYGON(({0}))', 4326) )".format(area) if area else "1=1 ",
             "AND (" + tagsQueryFilter(tags, "nodes") + ")" if tags else "",
-            "ORDER BY nodes.timestamp DESC LIMIT " + str(RESULTS_PER_PAGE) + " OFFSET {0}".format(page * RESULTS_PER_PAGE) if page else "",
+            "ORDER BY nodes.timestamp DESC LIMIT " + str(RESULTS_PER_PAGE_LIST) + " OFFSET {0}".format(page * RESULTS_PER_PAGE_LIST) if page else "",
         )
         return self.underpassDB.run(query, responseType, True)
 

diff --git a/python/restapi/models.py b/python/restapi/models.py
@@ -13,6 +13,5 @@ class OsmchangeValidateRequest(BaseModel):
 
 class RawRequest(BaseModel):
     area: str = None
-    key: str = None
-    value: str = None
+    tags: str = None
     page: int = None