Merge pull request #57 from spectriclabs/ColorByFix

ColorByFix

Author: desean1625

elastic_datashader/elastic.py

@@ -35,13 +35,13 @@ def scan(search, use_scroll=False, size=10000):
     search = search.sort("_doc")
     if use_scroll:
         for hit in search.scan():
-            yield from hit
+            yield hit
     else:
         _search = search.params(size=size).extra(track_total_hits=False)
         while _search is not None:
             hit = None
             for hit in _search:
-                yield from hit
+                yield hit
             if hit is not None:
                 _search = search.extra(search_after=list(hit.meta.sort))
             else:
@@ -379,10 +379,9 @@ def convert_composite(response, categorical, filter_buckets, histogram_interval,
     if categorical and filter_buckets is False:
         # Convert a regular terms aggregation
         for bucket in response:
+            lon, lat = geotile_bucket_to_lonlat(bucket)
+            x, y = lnglat_to_meters(lon, lat)
             for category in bucket.categories:
-                lon, lat = geotile_bucket_to_lonlat(bucket)
-                x, y = lnglat_to_meters(lon, lat)
-
                 raw = category.key
                 # Bin the data
                 if histogram_interval is not None:
@@ -406,12 +405,11 @@ def convert_composite(response, categorical, filter_buckets, histogram_interval,
     elif categorical and filter_buckets is True:
         # Convert a filter bucket aggregation
         for bucket in response:
+            lon, lat = geotile_bucket_to_lonlat(bucket)
+            x, y = lnglat_to_meters(lon, lat)
             for key in bucket.categories.buckets:
                 category = bucket.categories.buckets[key]
                 if category.doc_count > 0:
-                    lon, lat = geotile_bucket_to_lonlat(bucket)
-                    x, y = lnglat_to_meters(lon, lat)
-
                     if category_type == "number":
                         try:
                             label = pynumeral.format(to_32bit_float(key), category_format)
@@ -597,7 +595,7 @@ def run_search(**kwargs):
 
         while response.aggregations.comp.buckets:
             for b in response.aggregations.comp.buckets:
-                yield from b
+                yield b
             if "after_key" in response.aggregations.comp:
                 after = response.aggregations.comp.after_key
             else:

elastic_datashader/parameters.py

@@ -351,7 +351,6 @@ def generate_global_params(headers, params, idx):
     global_doc_cnt = 0
 
     bounds_s = copy.copy(base_s)
-    bounds_s = bounds_s.params(size=0)
 
     # We only need to do a global query if we are in span 'auto' or
     # using a numeric category

pyproject.toml

@@ -24,13 +24,14 @@ python = ">=3.10,<4"
 elasticsearch = "8.11.1"
 elasticsearch-dsl = "8.11.0"
 datashader = "0.16.0"
-pandas = "^1.5.3"
+pandas = "^2.0.0"
 colorcet = "^3.0.1"
 mercantile = "1.2.1"
 pypng = "*"
 Pillow = "*"
 pynumeral = "*"
 arrow = "*"
+pyarrow = "*"
 python-datemath = "*"
 numba = "0.57.1"
 numpy = "^1.23"