geodeploy 1.3.0__tar.gz → 1.4.0__tar.gz

{geodeploy-1.3.0/geodeploy.egg-info → geodeploy-1.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: geodeploy
-Version: 1.3.0
+Version: 1.4.0
 Summary: Command-line client and Python API for GeoDeploy — upload spatial data, build and publish portals.
 Author: Koffi Dodji Noumonvi
 License-Expression: Apache-2.0

{geodeploy-1.3.0 → geodeploy-1.4.0}/geodeploy/__init__.py

@@ -14,7 +14,7 @@ from __future__ import annotations
 # The CLI's version tracks the GeoDeploy release it ships with. A PyPI version can never be
 # re-uploaded, so a number is only spent once the release it names exists: 1.3.0b1 proved the
 # packaging against the real index, and this is the release it was rehearsing for.
-__version__ = "1.3.0"
+__version__ = "1.4.0"
 
 from .client import Client  # noqa: E402  (after __version__ — the user agent reads it)
 from .errors import (  # noqa: E402

{geodeploy-1.3.0 → geodeploy-1.4.0}/geodeploy/cli/commands/_common.py

@@ -27,8 +27,9 @@ def add_style_args(parser, raster: bool = True) -> None:
     single.add_argument("--outline-color",
                         help="outline colour, or 'none' for no outline at all")
     single.add_argument("--outline-width", type=float,
-                        help="point outline width as a FRACTION of the radius (0-1, default 0.28) "
-                             "— a wide one on a small marker is how a ring is drawn")
+                        help="outline width. On POINTS a fraction of the radius (0-1, default "
+                             "0.28) — a wide one on a small marker is how a ring is drawn. On "
+                             "POLYGONS a width in px (default 1)")
     single.add_argument("--line-width", type=float, help="line width in px")
     single.add_argument("--radius", type=float, help="point radius in px")
     single.add_argument("--marker", choices=MARKERS, help="point marker shape")
@@ -77,9 +78,25 @@ def add_style_args(parser, raster: bool = True) -> None:
     if raster:
         rast = parser.add_argument_group("raster")
         rast.add_argument("--colormap", help="TiTiler colormap, e.g. viridis (see `layers colormaps`)")
+        rast.add_argument("--reverse-colormap", dest="colormap_reverse", action="store_true",
+                          default=None,
+                          help="flip the palette (low values take the colour high values had)")
+        rast.add_argument("--no-reverse-colormap", dest="colormap_reverse", action="store_false",
+                          help="undo --reverse-colormap")
         rast.add_argument("--rescale", help="stretch as 'min,max' (see `layers stats` for a suggestion)")
-        rast.add_argument("--algorithm", help="e.g. hillshade (single-band)")
+        rast.add_argument("--algorithm", help="hillshade or contours (single-band)")
         rast.add_argument("--zfactor", type=float, help="hillshade vertical exaggeration")
+        # Contours colours the data across its range with a built-in terrain ramp and draws the
+        # lines on that, so --rescale is not decoration here: without it the whole raster renders
+        # as one flat band. See services/titiler._contour_params.
+        rast.add_argument("--increment", type=float,
+                          help="contour interval, in the raster's own units (default 35)")
+        rast.add_argument("--thickness", type=int,
+                          help="contour line width in pixels (default 1)")
+        rast.add_argument("--minz", type=float,
+                          help="low end of the contour colour range (defaults to --rescale)")
+        rast.add_argument("--maxz", type=float,
+                          help="high end of the contour colour range (defaults to --rescale)")
         rast.add_argument("--bidx", help="band selection: '1' or '3,2,1' for an RGB composite")
 
     parser.add_argument("--style-json",
@@ -112,7 +129,8 @@ def style_from_args(args, client=None, layer_ref: Optional[Any] = None,
 
     kwargs = {}  # type: Dict[str, Any]
     for name in ("color", "fill_opacity", "outline_color", "outline_width", "line_width",
-                 "radius", "marker", "line_type", "colormap", "rescale", "algorithm", "zfactor",
+                 "radius", "marker", "line_type", "colormap", "colormap_reverse",
+                 "rescale", "algorithm", "zfactor", "increment", "thickness", "minz", "maxz",
                  "color_field", "color_mode", "size_field", "other_color", "size_stops",
                  "extrude_field", "extrude_scale", "extrude_base", "extrude_color",
                  "extrude_opacity", "extrude_radius"):

{geodeploy-1.3.0 → geodeploy-1.4.0}/geodeploy/cli/commands/layers.py

@@ -12,6 +12,7 @@ import sys
 from ...errors import GeoDeployError, NotFoundError, ValidationError
 from ..main import add_command, group_parser
 from ..output import EXIT_GENERIC, EXIT_OK, human_size
+from ...styles import RASTER_STYLE_KEYS
 from ._common import (add_style_args, confirm, layer_ref_arg, parse_fields, resolve_layer,
                       style_from_args, write_json_file)
 
@@ -58,6 +59,7 @@ examples:
   geodeploy layers style sites --marker star --radius 6 --outline-color none
   geodeploy layers style parcels --color-field pop --classify jenks --classes 6 --ramp magma
   geodeploy layers style dem --colormap terrain --rescale 0,2400
+  geodeploy layers style depth --colormap blues --reverse-colormap
 """)
     layer_ref_arg(style)
     style.add_argument("--popup-fields", help="comma-separated attribute names for popups")
@@ -190,7 +192,8 @@ def cmd_legend(ctx, args) -> int:
         ctx.out.json(legend)
         return EXIT_OK
     if legend.get("ramp"):
-        ctx.out.record(legend, ["layer", "colormap", "rescale", "algorithm", "bidx", "band_count"])
+        ctx.out.record(legend, ["layer", "colormap", "colormap_reverse", "rescale", "algorithm",
+                                "zfactor", "increment", "thickness", "bidx", "band_count"])
         ctx.out.info("A raster legend is a continuous ramp, so there are no swatches to list.")
         return EXIT_OK
     ctx.out.out(ctx.out.bold(legend.get("layer") or ""))
@@ -467,7 +470,7 @@ def cmd_style(ctx, args) -> int:
     else:
         # The raster default-style body is flat: colormap/rescale/algorithm live at the top level.
         body = {"opacity": body["opacity"]}
-        for key in ("colormap", "rescale", "algorithm", "zfactor", "bidx"):
+        for key in RASTER_STYLE_KEYS:
             if style.get(key) is not None:
                 body[key] = style[key]
 

{geodeploy-1.3.0 → geodeploy-1.4.0}/geodeploy/portals.py

@@ -136,6 +136,19 @@ class Portals(object):
 
     # ── layers on a portal ──────────────────────────────────────────────────────────────────────
 
+    def upload_thumbnail(self, portal_id: Any, path: str) -> Dict[str, Any]:
+        """The card image for this portal — the picture shown wherever it is listed.
+
+        The dashboard captures its map canvas at publish time; anything else that publishes a
+        portal has to supply its own, or the card stays blank. Separate from `upload_asset`: a
+        portal has exactly one thumbnail, and the server replaces the previous one.
+        """
+        from .transport import MultipartBody
+        body = MultipartBody(file_path=path, filename=os.path.basename(path))
+        return self._c.request("POST", "/portals/{0}/thumbnail".format(int(portal_id)),
+                               body=body, content_type=body.content_type,
+                               timeout=self._c.upload_timeout)
+
     def layers(self, portal: Any) -> List[Dict[str, Any]]:
         """The portal's layer configs, top of the list first."""
         doc = portal if isinstance(portal, dict) else self.get(portal)

{geodeploy-1.3.0 → geodeploy-1.4.0}/geodeploy/styles.py

@@ -31,6 +31,14 @@ COLOR_MODES = ("single", "graduated", "categorized")
 #: what an uninitialised colour input produces and would silently turn outlines off.
 NO_OUTLINE = "none"
 
+#: Every key a RASTER style is made of — the twin of `services/titiler.STYLE_KEYS` and of
+#: `ui/src/lib/mapStyle.RASTER_STYLE_KEYS`. `opacity` is not one of them: the map applies it, the
+#: tile server does not. Named once because the same list, written out by hand, had already fallen
+#: behind in four UI components, seven API call sites and this CLI — and a key that is merely
+#: FORGOTTEN does not fail. It quietly serves the layer in a style nobody chose.
+RASTER_STYLE_KEYS = ("colormap", "colormap_reverse", "rescale", "algorithm", "zfactor", "bidx",
+                     "color_classes", "increment", "thickness", "minz", "maxz")
+
 #: CLI/keyword name → the key the style dict actually uses. Only `line_type` differs, and it
 #: differs because the stored key is camelCase (`lineType`) for historical reasons.
 _SIMPLE_KEYS = (
@@ -46,6 +54,11 @@ _SIMPLE_KEYS = (
     ("rescale", "rescale"),
     ("algorithm", "algorithm"),
     ("zfactor", "zfactor"),
+    # Contours: spacing, line width, and the range its background relief is coloured over.
+    ("increment", "increment"),
+    ("thickness", "thickness"),
+    ("minz", "minz"),
+    ("maxz", "maxz"),
     ("bidx", "bidx"),
     ("other_color", "other_color"),
     ("color_field", "color_field"),
@@ -255,10 +268,20 @@ def _validate(style: Dict[str, Any]) -> None:
     mode = style.get("color_mode")
     if mode is not None and mode not in COLOR_MODES:
         raise ValidationError(400, "Colour mode must be one of {0}.".format(", ".join(COLOR_MODES)))
-    for key in ("fill_opacity", "outline_width"):
-        value = style.get(key)
-        if value is not None and not 0 <= float(value) <= 1:
-            raise ValidationError(400, "{0} is a fraction between 0 and 1.".format(key))
+    value = style.get("fill_opacity")
+    if value is not None and not 0 <= float(value) <= 1:
+        raise ValidationError(400, "fill_opacity is a fraction between 0 and 1.")
+    # `outline_width` MEANS TWO THINGS and this validator cannot see the geometry: on a POINT it is
+    # a fraction of the radius (0-1), on a POLYGON a width in CSS pixels. Refusing anything above 1
+    # made a polygon border impossible to set from here at all — "outline_width is a fraction
+    # between 0 and 1" for a perfectly ordinary 3 px edge. The renderers clamp for their own
+    # geometry (a marker ratio is capped at 1, a polygon width at 40), so the check here is only a
+    # sanity bound on a number that has no single unit.
+    value = style.get("outline_width")
+    if value is not None and not 0 <= float(value) <= 40:
+        raise ValidationError(
+            400, "outline_width is a fraction of the radius on points (0-1) and a width in pixels "
+                 "on polygons (up to 40).")
 
 
 class Style(object):

{geodeploy-1.3.0 → geodeploy-1.4.0/geodeploy.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: geodeploy
-Version: 1.3.0
+Version: 1.4.0
 Summary: Command-line client and Python API for GeoDeploy — upload spatial data, build and publish portals.
 Author: Koffi Dodji Noumonvi
 License-Expression: Apache-2.0