3
0
Fork 0
mirror of https://github.com/farmOS/farmOS.git synced 2024-02-23 11:37:38 +01:00
Commit graph

1334 commits

Author SHA1 Message Date
paul121
e7978e89e8 Set the text color of map control buttons to match the SVG path fill color. 2021-04-08 16:36:16 -04:00
paul121
2c5a38dc6f Issue #3207716 by paul121: Use BundleFieldDefinition for additional Consumer fields 2021-04-08 15:57:27 -04:00
Michael Stenta
2b95c6458c Issue #3207255: Update csv_serialization and entity_reference_integrity to stable releases. 2021-04-08 15:53:53 -04:00
Michael Stenta
05c677a4fe Merge branch '2.x-map_asset_behavior' into 2.x
Issue #3188579 by paul121: Create map behaviors to view Locations
Issue #3188582 by paul121: Create map behavior for current asset location
2021-04-08 15:48:26 -04:00
Michael Stenta
2cfb5ba402 Remove popup dependency from asset_type_layers behavior. 2021-04-08 15:37:23 -04:00
Michael Stenta
930df73049 Revert "Add a setting to configure if the map popup behavior is enabled."
This reverts commit 19f8851543.
2021-04-08 15:37:23 -04:00
Michael Stenta
c7ddaab912 Add land/structure type layers to land/structure asset Views. 2021-04-08 15:37:23 -04:00
Michael Stenta
a27225e383 Ensure that farm_ui_map's hook_views_pre_render() runs first. 2021-04-08 15:37:23 -04:00
Michael Stenta
76b46403f3 Add support for array parameters in asset_type_layers.js. 2021-04-08 15:37:23 -04:00
Michael Stenta
5ee898f819 Add bundle-specific exposed filters to the farm_asset_geojson View. 2021-04-08 15:37:23 -04:00
Michael Stenta
82a77648c8 Create a helper function for adding bundle-specific field and filter formatters. 2021-04-08 15:37:23 -04:00
Michael Stenta
9481dd7207 Only add a single asset cluster layer to maps.
When there are multiple cluster layers the meaning of the
numbers becomes less discernible. Setting different cluster
icon colors may improve this, but a single layer is simple
for now. The exposed and contextual type filter allows
limiting the cluster counts by type if necessary.
2021-04-08 15:37:23 -04:00
Michael Stenta
b4b19147a9 Allow multiple asset type contextual filters in farm_asset_geojson View. 2021-04-08 15:37:23 -04:00
Michael Stenta
a415eb0714 Refactor bundle filtering logic to take exposed type filter into account. 2021-04-08 15:37:23 -04:00
Michael Stenta
4f8583593a Dynamically copy all exposed filters from farm_asset View to farm_asset_geojson Views.
This allows the map on /assets/% to be filtered with the same
exposed filters as the farm_asset View itself.
2021-04-08 15:37:23 -04:00
Michael Stenta
33c47849b8 Remove logic for adding separate land/structure type layers.
This needs to be refactored/moved to the land/structure modules.
2021-04-08 15:37:23 -04:00
Michael Stenta
165f4728da Update views_geojson module to ^1.1. 2021-04-08 15:37:23 -04:00
Michael Stenta
ce2a6304c8 Remove "Other locations" layer from dashboard. 2021-04-08 15:37:23 -04:00
Michael Stenta
fe95745153 Remove farmOS-map version from farm_map.libraries.yml.
We don't need to keep this up-to-date alongside the composer.json version constraint.
2021-04-08 15:37:23 -04:00
Michael Stenta
bfffc82188 Add recommended proxy buffer config to example nginx config for local HTTPS.
I found that this was necessary for the asset GeoJSON Views to prevent 502 Bad Gateway.
2021-04-08 15:37:23 -04:00
Michael Stenta
c82536d4d0 Move asset_type_layers behavior to farm_ui_map. 2021-04-08 15:37:23 -04:00
Michael Stenta
2e4d0bef1d Move logic for disabling zoom when WKT is present to farm_ui_map. 2021-04-08 15:37:23 -04:00
Michael Stenta
83e6d3abfb Add "all locations" layers to default and geofield maps via farm_ui_map instead of default behaviors. 2021-04-08 15:37:23 -04:00
Michael Stenta
b58f4f8b1a Move dashboard map and block to farm_ui_map. 2021-04-08 14:59:39 -04:00
Michael Stenta
07b06b3a5f Move subscriber logic for adding dashboard map asset layers to farm_ui_map. 2021-04-08 11:24:55 -04:00
Michael Stenta
746e189664 Split map logic out of farm_ui_views to a new farm_ui_map module. 2021-04-08 11:24:55 -04:00
Michael Stenta
f57cebd68f Split Asset GeoJSON Views displays out to their own View provided by the farm_location module. 2021-04-08 11:24:55 -04:00
Michael Stenta
c750aedd36 Depend on Geofield ^1.22 and remove committed patches. 2021-04-08 11:24:55 -04:00
Michael Stenta
666d5e8151 Patch Geofield to fix Issue #3207216: LatLon schema error: settings.output_escape missing schema
Note that this does not directly fix any issue in farmOS, but prevents
schema issues from happening when a LatLon formatter config is saved in
the future.
2021-04-08 11:24:55 -04:00
Michael Stenta
577f04fa0c Patch Geofield to add support for centroid WKT in LatLon formatter (Issue #3207078), and remove custom geofield_centroid formatter. 2021-04-08 11:24:55 -04:00
paul121
19f8851543 Add a setting to configure if the map popup behavior is enabled. 2021-04-08 11:24:55 -04:00
paul121
848f271882 Add the asset_type_layers behavior to the asset_list map config. 2021-04-08 11:24:55 -04:00
paul121
d2d42f3811 Add an "Other locations" layer to the dashboard map. 2021-04-08 11:24:55 -04:00
paul121
a51c58185a Add layers for location asset types to the dashboard map. 2021-04-08 11:24:55 -04:00
paul121
8b4e1eeb9f Add cache tag on the map type. 2021-04-08 11:24:55 -04:00
paul121
7487a782e0 Remove redundant div. 2021-04-08 11:24:55 -04:00
paul121
e066abfd49 Zoom to WKT if it exists else zoom to all locations vectors. 2021-04-08 11:24:55 -04:00
paul121
b5a56381b4 Use array_replace_recursive to allow overriding of values. 2021-04-08 11:24:55 -04:00
paul121
dd423d2208 Dynamically add asset layers to the dashboard map. 2021-04-08 11:24:55 -04:00
paul121
42d1e75535 Add helper function to get the map target ID. 2021-04-08 11:24:55 -04:00
paul121
2baa65eeba Display asset cluster layers in a separate layer group. 2021-04-08 11:24:55 -04:00
paul121
515352ef4e Create a geojson feed of asset centroids. Change paths to be assets/geojson/{geom_type}/{asset_type} 2021-04-08 11:24:55 -04:00
paul121
e6f3ec7ece Provide a centroid formatter to format geofield centroids as a WKT point. 2021-04-08 11:24:55 -04:00
paul121
0ad329e5fd Add an All locations layer to default and geofield maps. 2021-04-08 11:24:55 -04:00
paul121
1383434df9 Do not default to the Assets layer group, make this optional. 2021-04-08 11:24:55 -04:00
paul121
fb09715727 Change asset geojson path to /assets/geojson/type and default to all. 2021-04-08 11:24:55 -04:00
paul121
214d9e9c1f Recreate the exposed_filters array before creating each map layer. 2021-04-08 11:24:55 -04:00
paul121
191caffb52 Reverse layers array before adding to the map instance. 2021-04-08 11:24:55 -04:00
paul121
1178422f75 Create individual layers for land_type and structure_type assets. 2021-04-08 11:24:55 -04:00
paul121
bdfd2546c2 Add land_type and structure_type exposed filters to asset geojson display. 2021-04-08 11:24:55 -04:00