titiler.core 2.0.0b2__tar.gz → 2.0.2__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (46) hide show
  1. {titiler_core-2.0.0b2 → titiler_core-2.0.2}/.gitignore +1 -0
  2. {titiler_core-2.0.0b2 → titiler_core-2.0.2}/PKG-INFO +2 -2
  3. {titiler_core-2.0.0b2 → titiler_core-2.0.2}/pyproject.toml +1 -1
  4. {titiler_core-2.0.0b2 → titiler_core-2.0.2}/titiler/core/__init__.py +1 -1
  5. {titiler_core-2.0.0b2 → titiler_core-2.0.2}/titiler/core/algorithm/dem.py +1 -1
  6. {titiler_core-2.0.0b2 → titiler_core-2.0.2}/titiler/core/dependencies.py +6 -6
  7. {titiler_core-2.0.0b2 → titiler_core-2.0.2}/titiler/core/templates/map.html +36 -22
  8. {titiler_core-2.0.0b2 → titiler_core-2.0.2}/titiler/core/utils.py +49 -6
  9. {titiler_core-2.0.0b2 → titiler_core-2.0.2}/LICENSE +0 -0
  10. {titiler_core-2.0.0b2 → titiler_core-2.0.2}/README.md +0 -0
  11. {titiler_core-2.0.0b2 → titiler_core-2.0.2}/titiler/core/algorithm/__init__.py +0 -0
  12. {titiler_core-2.0.0b2 → titiler_core-2.0.2}/titiler/core/algorithm/base.py +0 -0
  13. {titiler_core-2.0.0b2 → titiler_core-2.0.2}/titiler/core/algorithm/image.py +0 -0
  14. {titiler_core-2.0.0b2 → titiler_core-2.0.2}/titiler/core/algorithm/index.py +0 -0
  15. {titiler_core-2.0.0b2 → titiler_core-2.0.2}/titiler/core/algorithm/math.py +0 -0
  16. {titiler_core-2.0.0b2 → titiler_core-2.0.2}/titiler/core/algorithm/ops.py +0 -0
  17. {titiler_core-2.0.0b2 → titiler_core-2.0.2}/titiler/core/errors.py +0 -0
  18. {titiler_core-2.0.0b2 → titiler_core-2.0.2}/titiler/core/factory.py +0 -0
  19. {titiler_core-2.0.0b2 → titiler_core-2.0.2}/titiler/core/middleware.py +0 -0
  20. {titiler_core-2.0.0b2 → titiler_core-2.0.2}/titiler/core/models/OGC.py +0 -0
  21. {titiler_core-2.0.0b2 → titiler_core-2.0.2}/titiler/core/models/__init__.py +0 -0
  22. {titiler_core-2.0.0b2 → titiler_core-2.0.2}/titiler/core/models/common.py +0 -0
  23. {titiler_core-2.0.0b2 → titiler_core-2.0.2}/titiler/core/models/mapbox.py +0 -0
  24. {titiler_core-2.0.0b2 → titiler_core-2.0.2}/titiler/core/models/responses.py +0 -0
  25. {titiler_core-2.0.0b2 → titiler_core-2.0.2}/titiler/core/py.typed +0 -0
  26. {titiler_core-2.0.0b2 → titiler_core-2.0.2}/titiler/core/resources/__init__.py +0 -0
  27. {titiler_core-2.0.0b2 → titiler_core-2.0.2}/titiler/core/resources/enums.py +0 -0
  28. {titiler_core-2.0.0b2 → titiler_core-2.0.2}/titiler/core/resources/responses.py +0 -0
  29. {titiler_core-2.0.0b2 → titiler_core-2.0.2}/titiler/core/routing.py +0 -0
  30. {titiler_core-2.0.0b2 → titiler_core-2.0.2}/titiler/core/telemetry.py +0 -0
  31. {titiler_core-2.0.0b2 → titiler_core-2.0.2}/titiler/core/templates/algorithm.html +0 -0
  32. {titiler_core-2.0.0b2 → titiler_core-2.0.2}/titiler/core/templates/algorithms.html +0 -0
  33. {titiler_core-2.0.0b2 → titiler_core-2.0.2}/titiler/core/templates/base.html +0 -0
  34. {titiler_core-2.0.0b2 → titiler_core-2.0.2}/titiler/core/templates/colormap.html +0 -0
  35. {titiler_core-2.0.0b2 → titiler_core-2.0.2}/titiler/core/templates/colormaps.html +0 -0
  36. {titiler_core-2.0.0b2 → titiler_core-2.0.2}/titiler/core/templates/debug.html +0 -0
  37. {titiler_core-2.0.0b2 → titiler_core-2.0.2}/titiler/core/templates/footer.html +0 -0
  38. {titiler_core-2.0.0b2 → titiler_core-2.0.2}/titiler/core/templates/header.html +0 -0
  39. {titiler_core-2.0.0b2 → titiler_core-2.0.2}/titiler/core/templates/icons/clock.html +0 -0
  40. {titiler_core-2.0.0b2 → titiler_core-2.0.2}/titiler/core/templates/icons/license.html +0 -0
  41. {titiler_core-2.0.0b2 → titiler_core-2.0.2}/titiler/core/templates/icons/tag.html +0 -0
  42. {titiler_core-2.0.0b2 → titiler_core-2.0.2}/titiler/core/templates/tilematrixset.html +0 -0
  43. {titiler_core-2.0.0b2 → titiler_core-2.0.2}/titiler/core/templates/tilematrixsets.html +0 -0
  44. {titiler_core-2.0.0b2 → titiler_core-2.0.2}/titiler/core/templates/tileset.html +0 -0
  45. {titiler_core-2.0.0b2 → titiler_core-2.0.2}/titiler/core/templates/tilesets.html +0 -0
  46. {titiler_core-2.0.0b2 → titiler_core-2.0.2}/titiler/core/validation.py +0 -0
@@ -48,6 +48,7 @@ htmlcov/
48
48
  .cache
49
49
  nosetests.xml
50
50
  coverage.xml
51
+ titiler-*.xml
51
52
  *.cover
52
53
  .hypothesis/
53
54
 
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: titiler-core
3
- Version: 2.0.0b2
3
+ Version: 2.0.2
4
4
  Summary: A modern dynamic tile server built on top of FastAPI and Rasterio/GDAL.
5
5
  Project-URL: Homepage, https://developmentseed.org/titiler/
6
6
  Project-URL: Documentation, https://developmentseed.org/titiler/
@@ -28,7 +28,7 @@ Requires-Dist: morecantile
28
28
  Requires-Dist: numpy
29
29
  Requires-Dist: pydantic~=2.0
30
30
  Requires-Dist: rasterio
31
- Requires-Dist: rio-tiler<10.0,>=9.0.0b1
31
+ Requires-Dist: rio-tiler<10.0,>=9.0
32
32
  Requires-Dist: simplejson
33
33
  Provides-Extra: telemetry
34
34
  Requires-Dist: opentelemetry-api; extra == 'telemetry'
@@ -36,7 +36,7 @@ dependencies = [
36
36
  "numpy",
37
37
  "pydantic~=2.0",
38
38
  "rasterio",
39
- "rio-tiler>=9.0.0b1,<10.0",
39
+ "rio-tiler>=9.0,<10.0",
40
40
  "morecantile",
41
41
  "simplejson",
42
42
  ]
@@ -1,6 +1,6 @@
1
1
  """titiler.core"""
2
2
 
3
- __version__ = "2.0.0b2"
3
+ __version__ = "2.0.2" # x-release-please-version
4
4
 
5
5
  from . import dependencies, errors, factory, routing # noqa
6
6
  from .factory import ( # noqa
@@ -152,7 +152,7 @@ class Contours(BaseAlgorithm):
152
152
  arr = numpy.where(data % self.increment < self.thickness, 0, arr)
153
153
 
154
154
  data = numpy.ma.MaskedArray(arr)
155
- data.mask = ~img.mask
155
+ data.mask = img.array.mask
156
156
 
157
157
  return ImageData(
158
158
  data,
@@ -317,9 +317,9 @@ class RenderingParams(DefaultDependency):
317
317
  r.split(","),
318
318
  )
319
319
  )
320
- assert (
321
- len(parsed) == 2
322
- ), f"Invalid rescale values: {self.rescale}, should be of form ['min,max', 'min,max'] or [[min,max], [min, max]]"
320
+ assert len(parsed) == 2, (
321
+ f"Invalid rescale values: {self.rescale}, should be of form ['min,max', 'min,max'] or [[min,max], [min, max]]"
322
+ )
323
323
  rescale_array.append(parsed)
324
324
 
325
325
  self.rescale: RescaleType = rescale_array # type: ignore
@@ -443,9 +443,9 @@ link: https://numpy.org/doc/stable/reference/generated/numpy.histogram.html
443
443
 
444
444
  if self.range:
445
445
  parsed = list(map(float, self.range.split(",")))
446
- assert (
447
- len(parsed) == 2
448
- ), f"Invalid histogram_range values: {self.range}, should be of form 'min,max'"
446
+ assert len(parsed) == 2, (
447
+ f"Invalid histogram_range values: {self.range}, should be of form 'min,max'"
448
+ )
449
449
 
450
450
  self.range = parsed # type: ignore
451
451
 
@@ -249,6 +249,7 @@
249
249
 
250
250
  fetch(`{{ point_endpoint|safe }}`.replace('{lat}', lat).replace('{lon}', lng))
251
251
  .then(res => {
252
+ if (res.status === 204) return null;
252
253
  if (res.ok) return res.json();
253
254
 
254
255
  return res.json().then(errorData => {
@@ -259,31 +260,44 @@
259
260
  })
260
261
  })
261
262
  .then(data => {
262
- const formatPopupContent = (data) => {
263
- let html = '<div style="max-width: 250px;">';
264
-
265
- html += `<p><strong>Coordinates:</strong> ${lat}, ${lng}</p>`;
263
+ if (data === null) {
264
+ popup.setContent(`<p>No data at ${lat}, ${lng}</p>`);
265
+ return;
266
+ }
266
267
 
267
- // single band case - just show the value
268
- if (data.band_names.length === 1) {
269
- const value = data.values[0] !== null ? data.values[0] : 'No data';
270
- html += `<p><strong>Value:</strong> ${value}</p>`;
268
+ const renderBandTable = (bandNames, values) => {
269
+ if (bandNames.length === 1) {
270
+ const value = values[0] !== null ? values[0] : 'No data';
271
+ return `<p><strong>Value:</strong> ${value}</p>`;
271
272
  }
272
- // multiple bands case - show in a table
273
- else {
274
- html += '<table style="width: 100%; border-collapse: collapse;">';
275
- html += '<tr><th style="text-align: left; padding: 1px; border-bottom: 1px solid #ddd;">Band</th>' +
276
- '<th style="text-align: right; padding: 1px; border-bottom: 1px solid #ddd;">Value</th></tr>';
277
-
278
- for (let i = 0; i < data.band_names.length; i++) {
279
- const value = data.values[i] !== null ? data.values[i] : 'No data';
280
- html += `<tr>
281
- <td style="text-align: left; padding: 1px;">${data.band_names[i]}</td>
282
- <td style="text-align: right; padding: 1px;">${value}</td>
283
- </tr>`;
284
- }
273
+ let html = '<table style="width: 100%; border-collapse: collapse;">';
274
+ html += '<tr>'
275
+ + '<th style="text-align: left; padding: 1px; border-bottom: 1px solid #ddd;">Band</th>'
276
+ + '<th style="text-align: right; padding: 1px; border-bottom: 1px solid #ddd;">Value</th>'
277
+ + '</tr>';
278
+ for (let i = 0; i < bandNames.length; i++) {
279
+ const value = values[i] !== null ? values[i] : 'No data';
280
+ html += `<tr>
281
+ <td style="text-align: left; padding: 1px;">${bandNames[i]}</td>
282
+ <td style="text-align: right; padding: 1px;">${value}</td>
283
+ </tr>`;
284
+ }
285
+ html += '</table>';
286
+ return html;
287
+ };
285
288
 
286
- html += '</table>';
289
+ const formatPopupContent = (data) => {
290
+ let html = `<div style="max-width: 250px;">
291
+ <p><strong>Coordinates:</strong> ${lat}, ${lng}</p>`;
292
+
293
+ if (data.values !== undefined) {
294
+ // TilerFactory shape: flat band list
295
+ html += renderBandTable(data.band_names, data.values);
296
+ } else if (data.assets !== undefined) {
297
+ // MosaicTilerFactory shape: one entry per asset
298
+ for (const asset of data.assets) {
299
+ html += renderBandTable(asset.band_names, asset.values);
300
+ }
287
301
  }
288
302
 
289
303
  html += '</div>';
@@ -12,8 +12,19 @@ import numpy
12
12
  import pyproj
13
13
  import rasterio
14
14
  from fastapi import FastAPI
15
+ from fastapi._compat import (
16
+ get_definitions,
17
+ get_flat_models_from_fields,
18
+ get_model_name_map,
19
+ )
15
20
  from fastapi.datastructures import QueryParams
16
- from fastapi.dependencies.utils import get_dependant, request_params_to_args
21
+ from fastapi.dependencies.models import Dependant
22
+ from fastapi.dependencies.utils import (
23
+ get_dependant,
24
+ get_flat_params,
25
+ request_params_to_args,
26
+ )
27
+ from fastapi.openapi.utils import _get_openapi_operation_parameters
17
28
  from geojson_pydantic.geometries import MultiPolygon, Polygon
18
29
  from morecantile import TileMatrixSet
19
30
  from rasterio.dtypes import dtype_ranges
@@ -250,6 +261,38 @@ def check_query_params(
250
261
  return True
251
262
 
252
263
 
264
+ def dependencies_to_openapi_params(
265
+ dependencies: list[Callable],
266
+ ) -> list[dict[str, Any]]:
267
+ """Extract OpenAPI query parameter schemas from a list of FastAPI dependencies.
268
+
269
+ This Code was generated with help of Claude 2.0. See plans/openapi-params-from-dependencies.prompt.md.
270
+ """
271
+ all_fields = []
272
+ seen: set[str] = set()
273
+ for dep in dependencies:
274
+ dependant = get_dependant(path="", call=dep)
275
+ for field in get_flat_params(dependant):
276
+ if field.name not in seen:
277
+ seen.add(field.name)
278
+ all_fields.append(field)
279
+
280
+ if not all_fields:
281
+ return []
282
+
283
+ flat_models = get_flat_models_from_fields(all_fields, known_models=set())
284
+ model_name_map = get_model_name_map(flat_models)
285
+ field_mapping, _ = get_definitions(fields=all_fields, model_name_map=model_name_map)
286
+
287
+ combined = Dependant(path="")
288
+ combined.query_params = all_fields
289
+ return _get_openapi_operation_parameters(
290
+ dependant=combined,
291
+ model_name_map=model_name_map,
292
+ field_mapping=field_mapping,
293
+ )
294
+
295
+
253
296
  def accept_media_type(accept: str, mediatypes: list[MediaType]) -> MediaType | None:
254
297
  """Return MediaType based on accept header and available mediatype.
255
298
 
@@ -460,11 +503,11 @@ def tms_limits_to_xml(limits: list[TMSLimits]) -> list[str]:
460
503
  for limit in limits:
461
504
  xml_limits.append(
462
505
  f"""<TileMatrixLimits>
463
- <TileMatrix>{limit['tileMatrix']}</TileMatrix>
464
- <MinTileRow>{limit['minTileRow']}</MinTileRow>
465
- <MaxTileRow>{limit['maxTileRow']}</MaxTileRow>
466
- <MinTileCol>{limit['minTileCol']}</MinTileCol>
467
- <MaxTileCol>{limit['maxTileCol']}</MaxTileCol>
506
+ <TileMatrix>{limit["tileMatrix"]}</TileMatrix>
507
+ <MinTileRow>{limit["minTileRow"]}</MinTileRow>
508
+ <MaxTileRow>{limit["maxTileRow"]}</MaxTileRow>
509
+ <MinTileCol>{limit["minTileCol"]}</MinTileCol>
510
+ <MaxTileCol>{limit["maxTileCol"]}</MaxTileCol>
468
511
  </TileMatrixLimits>""",
469
512
  )
470
513
 
File without changes
File without changes