Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update widget types #279

Merged
merged 4 commits into from
Oct 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
241 changes: 121 additions & 120 deletions examples/mode-map/ecoscope-workflows-mode-map-workflow/pixi.lock

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -688,10 +688,10 @@
"properties": {
"widget_type": {
"enum": [
"plot",
"graph",
"map",
"text",
"single_value"
"stat"
],
"title": "Widget Type",
"type": "string"
Expand Down Expand Up @@ -768,10 +768,10 @@
"properties": {
"widget_type": {
"enum": [
"plot",
"graph",
"map",
"text",
"single_value"
"stat"
],
"title": "Widget Type",
"type": "string"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -179,10 +179,10 @@ class NorthArrowStyle(BaseModel):


class WidgetType(str, Enum):
plot = "plot"
graph = "graph"
map = "map"
text = "text"
single_value = "single_value"
stat = "stat"


class WidgetSingleView(BaseModel):
Expand Down

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -1656,10 +1656,10 @@
"properties": {
"widget_type": {
"enum": [
"plot",
"graph",
"map",
"text",
"single_value"
"stat"
],
"title": "Widget Type",
"type": "string"
Expand Down Expand Up @@ -1762,10 +1762,10 @@
"properties": {
"widget_type": {
"enum": [
"plot",
"graph",
"map",
"text",
"single_value"
"stat"
],
"title": "Widget Type",
"type": "string"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -476,10 +476,10 @@ class PlotStyle(BaseModel):


class WidgetType(str, Enum):
plot = "plot"
graph = "graph"
map = "map"
text = "text"
single_value = "single_value"
stat = "stat"


class WidgetSingleView(BaseModel):
Expand Down

Large diffs are not rendered by default.

36 changes: 18 additions & 18 deletions examples/patrol-events/test-cases.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,12 @@ test1:
directive: "%B" # (typing.Literal['%a', '%A', '%b', '%B', '%c', '%d', '%f', '%H', '%I', '%j', '%m', '%M', '%p', '%S', '%U', '%w', '%W', '%x', '%X', '%y', '%Y', '%z', '%%'], FieldInfo(annotation=NoneType, required=True, description='A directive for formatting the time data.'))
# Parameters for 'Patrol Events Colormap' using task `apply_color_map`.
pe_colormap:
input_column_name: "event_type" # (<class 'str'>, FieldInfo(annotation=NoneType, required=True, description='The name of the column with categorical values.'))
colormap: "tab20b" # (str | list[str], FieldInfo(annotation=NoneType, required=True, description='Either a named mpl.colormap or a list of string hex values.'))
input_column_name: "event_type" # (<class 'str'>, FieldInfo(annotation=NoneType, required=True, description='The name of the column with categorical values.'))
colormap: "tab20b" # (str | list[str], FieldInfo(annotation=NoneType, required=True, description='Either a named mpl.colormap or a list of string hex values.'))
output_column_name: "event_type_colormap"
# Parameters for 'Create map layer from Patrol Events' using task `create_map_layer`.
pe_map_layer:
layer_style: # (ecoscope_workflows.tasks.results._ecomap.PolylineLayerStyle | ecoscope_workflows.tasks.results._ecomap.PolygonLayerStyle | ecoscope_workflows.tasks.results._ecomap.PointLayerStyle, FieldInfo(annotation=NoneType, required=True, description='Style arguments for the layer.'))
layer_style: # (ecoscope_workflows.tasks.results._ecomap.PolylineLayerStyle | ecoscope_workflows.tasks.results._ecomap.PolygonLayerStyle | ecoscope_workflows.tasks.results._ecomap.PointLayerStyle, FieldInfo(annotation=NoneType, required=True, description='Style arguments for the layer.'))
layer_type: "point"
fill_color_column: "event_type_colormap"
get_radius: 5
Expand Down Expand Up @@ -73,19 +73,19 @@ test1:
title: "Patrol Events Bar Chart" # (<class 'str'>, FieldInfo(annotation=NoneType, required=True, description='The title of the widget'))
# Parameters for 'Create Patrol Events Meshgrid' using task `create_meshgrid`.
pe_meshgrid:
cell_width: 10000 # (<class 'int'>, FieldInfo(annotation=NoneType, required=True, description='The width of a grid cell in meters.'))
cell_height: 10000 # (<class 'int'>, FieldInfo(annotation=NoneType, required=True, description='The height of a grid cell in meters.'))
cell_width: 10000 # (<class 'int'>, FieldInfo(annotation=NoneType, required=True, description='The width of a grid cell in meters.'))
cell_height: 10000 # (<class 'int'>, FieldInfo(annotation=NoneType, required=True, description='The height of a grid cell in meters.'))
# Parameters for 'Patrol Events Feature Density' using task `calculate_feature_density`.
pe_feature_density:
geometry_type: "point" # (typing.Literal['point', 'line'], FieldInfo(annotation=NoneType, required=True, description='The geometry type of the provided geodataframe'))
geometry_type: "point" # (typing.Literal['point', 'line'], FieldInfo(annotation=NoneType, required=True, description='The geometry type of the provided geodataframe'))
# Parameters for 'Feature Density Colormap' using task `apply_color_map`.
fd_colormap:
input_column_name: "density" # (<class 'str'>, FieldInfo(annotation=NoneType, required=True, description='The name of the column with categorical values.'))
colormap: "YlOrRd" # (str | list[str], FieldInfo(annotation=NoneType, required=True, description='Either a named mpl.colormap or a list of string hex values.'))
input_column_name: "density" # (<class 'str'>, FieldInfo(annotation=NoneType, required=True, description='The name of the column with categorical values.'))
colormap: "YlOrRd" # (str | list[str], FieldInfo(annotation=NoneType, required=True, description='Either a named mpl.colormap or a list of string hex values.'))
output_column_name: "density_colormap"
# Parameters for 'Create map layer from Feature Density' using task `create_map_layer`.
fd_map_layer:
layer_style: # (ecoscope_workflows.tasks.results._ecomap.PolylineLayerStyle | ecoscope_workflows.tasks.results._ecomap.PolygonLayerStyle | ecoscope_workflows.tasks.results._ecomap.PointLayerStyle, FieldInfo(annotation=NoneType, required=True, description='Style arguments for the layer.'))
layer_style: # (ecoscope_workflows.tasks.results._ecomap.PolylineLayerStyle | ecoscope_workflows.tasks.results._ecomap.PolygonLayerStyle | ecoscope_workflows.tasks.results._ecomap.PointLayerStyle, FieldInfo(annotation=NoneType, required=True, description='Style arguments for the layer.'))
layer_type: "polygon"
fill_color_column: "density_colormap"
opacity: 0.4
Expand All @@ -102,12 +102,12 @@ test1:
split_patrol_event_groups: {}
# Parameters for 'Grouped Patrol Events Colormap' using task `apply_color_map`.
grouped_pe_colormap:
input_column_name: "event_type" # (<class 'str'>, FieldInfo(annotation=NoneType, required=True, description='The name of the column with categorical values.'))
colormap: "tab20b" # (str | list[str], FieldInfo(annotation=NoneType, required=True, description='Either a named mpl.colormap or a list of string hex values.'))
input_column_name: "event_type" # (<class 'str'>, FieldInfo(annotation=NoneType, required=True, description='The name of the column with categorical values.'))
colormap: "tab20b" # (str | list[str], FieldInfo(annotation=NoneType, required=True, description='Either a named mpl.colormap or a list of string hex values.'))
output_column_name: "event_type_colormap"
# Parameters for 'Create map layer from grouped Patrol Events' using task `create_map_layer`.
grouped_pe_map_layer:
layer_style: # (ecoscope_workflows.tasks.results._ecomap.PolylineLayerStyle | ecoscope_workflows.tasks.results._ecomap.PolygonLayerStyle | ecoscope_workflows.tasks.results._ecomap.PointLayerStyle, FieldInfo(annotation=NoneType, required=True, description='Style arguments for the layer.'))
layer_style: # (ecoscope_workflows.tasks.results._ecomap.PolylineLayerStyle | ecoscope_workflows.tasks.results._ecomap.PolygonLayerStyle | ecoscope_workflows.tasks.results._ecomap.PointLayerStyle, FieldInfo(annotation=NoneType, required=True, description='Style arguments for the layer.'))
layer_type: "point"
fill_color_column: "event_type_colormap"
get_radius: 5
Expand Down Expand Up @@ -136,15 +136,15 @@ test1:
grouped_pe_pie_widget_merge: {}
# Parameters for 'Grouped Patrol Events Feature Density' using task `calculate_feature_density`.
grouped_pe_feature_density:
geometry_type: "point" # (typing.Literal['point', 'line'], FieldInfo(annotation=NoneType, required=True, description='The geometry type of the provided geodataframe'))
geometry_type: "point" # (typing.Literal['point', 'line'], FieldInfo(annotation=NoneType, required=True, description='The geometry type of the provided geodataframe'))
# Parameters for 'Grouped Feature Density Colormap' using task `apply_color_map`.
grouped_fd_colormap:
input_column_name: "density" # (<class 'str'>, FieldInfo(annotation=NoneType, required=True, description='The name of the column with categorical values.'))
colormap: "YlOrRd" # (str | list[str], FieldInfo(annotation=NoneType, required=True, description='Either a named mpl.colormap or a list of string hex values.'))
input_column_name: "density" # (<class 'str'>, FieldInfo(annotation=NoneType, required=True, description='The name of the column with categorical values.'))
colormap: "YlOrRd" # (str | list[str], FieldInfo(annotation=NoneType, required=True, description='Either a named mpl.colormap or a list of string hex values.'))
output_column_name: "density_colormap"
# Parameters for 'Create map layer from Feature Density' using task `create_map_layer`.
grouped_fd_map_layer:
layer_style: # (ecoscope_workflows.tasks.results._ecomap.PolylineLayerStyle | ecoscope_workflows.tasks.results._ecomap.PolygonLayerStyle | ecoscope_workflows.tasks.results._ecomap.PointLayerStyle, FieldInfo(annotation=NoneType, required=True, description='Style arguments for the layer.'))
layer_style: # (ecoscope_workflows.tasks.results._ecomap.PolylineLayerStyle | ecoscope_workflows.tasks.results._ecomap.PolygonLayerStyle | ecoscope_workflows.tasks.results._ecomap.PointLayerStyle, FieldInfo(annotation=NoneType, required=True, description='Style arguments for the layer.'))
layer_type: "polygon"
fill_color_column: "density_colormap"
opacity: 0.4
Expand All @@ -170,5 +170,5 @@ test1:
- "widget_type='map', title='Density Map'"
- "widget_type='map', title='Grouped Patrol Events Map'"
- "widget_type='map', title='Grouped Density Map'"
- "widget_type='plot', title='Patrol Events Bar Chart'"
- "widget_type='plot', title='Patrol Events Pie Chart'"
- "widget_type='graph', title='Patrol Events Bar Chart'"
- "widget_type='graph', title='Patrol Events Pie Chart'"
Original file line number Diff line number Diff line change
Expand Up @@ -1848,10 +1848,10 @@
"properties": {
"widget_type": {
"enum": [
"plot",
"graph",
"map",
"text",
"single_value"
"stat"
],
"title": "Widget Type",
"type": "string"
Expand Down Expand Up @@ -2066,10 +2066,10 @@
"properties": {
"widget_type": {
"enum": [
"plot",
"graph",
"map",
"text",
"single_value"
"stat"
],
"title": "Widget Type",
"type": "string"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -506,10 +506,10 @@ class NorthArrowStyle(BaseModel):


class WidgetType(str, Enum):
plot = "plot"
graph = "graph"
map = "map"
text = "text"
single_value = "single_value"
stat = "stat"


class WidgetSingleView(BaseModel):
Expand Down
Loading