From 38d175ceb2fa3ffe4bdff6790bb8f56b54f12191 Mon Sep 17 00:00:00 2001 From: bach Date: Mon, 30 Oct 2023 19:20:20 +0100 Subject: [PATCH] patched leaflet_more_map for stamen x stadiamaps.com, updated views_bulk_edit --- composer.json | 3 + composer.lock | 28 +-- config/sync/views.view.projets.yml | 282 ++++++++++++++++------------- 3 files changed, 171 insertions(+), 142 deletions(-) diff --git a/composer.json b/composer.json index 279e34f..45afffb 100644 --- a/composer.json +++ b/composer.json @@ -140,6 +140,9 @@ }, "drupal/page_manager": { "optional path arguments https://www.drupal.org/project/page_manager/issues/2810329" : "https://www.drupal.org/files/issues/2020-06-04/page_manager-allow_optional_parameters-2810329-16.patch" + }, + "drupal/leaflet_more_maps": { + "Stamen map tiles moving to Stadia hosting and will no longer be available at old URL https://www.drupal.org/project/leaflet_more_maps/issues/3393412": "https://git.drupalcode.org/project/leaflet_more_maps/-/merge_requests/5.diff" } } } diff --git a/composer.lock b/composer.lock index 3122866..722589e 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "1776611211486f239fefcac487de127f", + "content-hash": "d7e66c13bb2cc1a87dcc389c5ddc751c", "packages": [ { "name": "alchemy/zippy", @@ -9068,23 +9068,23 @@ }, { "name": "drupal/views_bulk_edit", - "version": "2.6.0", + "version": "2.9.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/views_bulk_edit.git", - "reference": "8.x-2.6" + "reference": "8.x-2.9" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/views_bulk_edit-8.x-2.6.zip", - "reference": "8.x-2.6", - "shasum": "0e0f1dab2fa0903cbe2656e754b0d9ed3a935fbb" + "url": "https://ftp.drupal.org/files/projects/views_bulk_edit-8.x-2.9.zip", + "reference": "8.x-2.9", + "shasum": "db45a8cc9ac629859374b24974eafcef257e4387" }, "require": { - "drupal/core": "^8 || ^9" + "drupal/core": "^9.4 || ^10" }, "require-dev": { - "drupal/views_bulk_operations": "~3.0" + "drupal/views_bulk_operations": "~4.2.4" }, "suggest": { "drupal/views_bulk_operations": "Get VBO for all the views benefits like batching, ability to select all view results or persistent selection across pages" @@ -9092,8 +9092,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-2.6", - "datestamp": "1623748025", + "version": "8.x-2.9", + "datestamp": "1690222256", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -9110,8 +9110,12 @@ "homepage": "https://www.drupal.org/u/graber" }, { - "name": "benjy", - "homepage": "https://www.drupal.org/user/1852732" + "name": "Graber", + "homepage": "https://www.drupal.org/user/1599440" + }, + { + "name": "joseph.olstad", + "homepage": "https://www.drupal.org/user/1321830" } ], "description": "Allows bulk edition of entity field values.", diff --git a/config/sync/views.view.projets.yml b/config/sync/views.view.projets.yml index 3b53c1f..6080a3a 100644 --- a/config/sync/views.view.projets.yml +++ b/config/sync/views.view.projets.yml @@ -438,7 +438,6 @@ display: data_source: field_geofield entity_source: __base_table name_field: title - description_field: '' view_mode: full leaflet_map: 'OSM Mapnik' height: '400' @@ -500,6 +499,7 @@ display: zoom: 16 popup: false options: '' + description_field: '' row: type: 'entity:node' options: @@ -875,83 +875,83 @@ display: display_extenders: views_ef_fieldset: views_ef_fieldset: - enabled: 0 + enabled: false options: sort: root: container_type: details - title: Filtres - description: '' - open: '1' - weight: '0' - id: root - pid: '' depth: '0' + description: '' + id: root + open: true + pid: '' + title: Filtres type: container + weight: '0' field_incube_value: - weight: '-8' + depth: '1' id: field_incube_value pid: root - depth: '1' type: filter - field_neuf_rehabilitation_value: weight: '-8' + field_neuf_rehabilitation_value: + depth: '1' id: field_neuf_rehabilitation_value pid: root - depth: '1' type: filter - field_encours_fini_value: weight: '-8' + field_encours_fini_value: + depth: '1' id: field_encours_fini_value pid: root - depth: '1' type: filter - submit: weight: '-8' + submit: + depth: '1' id: submit pid: root - depth: '1' type: buttons + weight: '-8' container-0: container_type: details - title: 'Container 0' - description: '' - weight: '-7' - open: 0 - id: container-0 - pid: root depth: '1' + description: '' + id: container-0 + open: false + pid: root + title: 'Container 0' type: container + weight: '-7' container-1: container_type: details - title: 'Container 1' - description: '' - weight: '-6' - open: 0 - id: container-1 - pid: root depth: '1' + description: '' + id: container-1 + open: false + pid: root + title: 'Container 1' type: container + weight: '-6' container-2: container_type: details - title: 'Container 2' - description: '' - weight: '-5' - open: 0 - id: container-2 - pid: root depth: '1' + description: '' + id: container-2 + open: false + pid: root + title: 'Container 2' type: container + weight: '-5' container-3: container_type: details - title: 'Container 3' - description: '' - weight: '-4' - open: 0 - id: container-3 - pid: root depth: '1' + description: '' + id: container-3 + open: false + pid: root + title: 'Container 3' type: container + weight: '-4' block_description: 'Projets block' cache_metadata: max-age: -1 @@ -1324,25 +1324,40 @@ display: type: leaflet_map options: grouping: { } - data_source: field_geofield + data_source: + field_geofield: field_geofield entity_source: __base_table name_field: title - description_field: title - view_mode: full + leaflet_tooltip: + value: '' + options: '{"permanent":false,"direction":"center"}' + leaflet_popup: + value: title + options: '{"maxWidth":"300","minWidth":"50","autoPan":true}' + view_mode: full leaflet_map: stamen-toner-lite height: '400' height_unit: px hide_empty_map: false disable_wheel: false gesture_handling: false + fitbounds_options: '{"padding":[0,0]}' reset_map: control: false - position: topright + options: '{"position":"topleft","title":"Reset View"}' + map_scale: + control: false + options: '{"position":"bottomright","maxWidth":100,"metric":true,"imperial":false,"updateWhenIdle":false}' + locate: + control: false + options: '{"position":"topright","setView":"untilPanOrZoom","returnToPrevBounds":true,"keepCurrentZoomLevel":true,"strings":{"title":"Locate my position"}}' + automatic: false map_position: force: true center: lat: 46.897597 lon: 2.82209 + zoomControlPosition: topleft zoom: 5 minZoom: 1 maxZoom: 18 @@ -1378,6 +1393,9 @@ display: geocoder: control: false settings: + autocomplete: + placeholder: 'Search Address' + title: 'Search an Address on the Map' position: topright input_size: 25 providers: @@ -1389,6 +1407,10 @@ display: zoom: 16 popup: false options: '' + map_lazy_load: + lazy_load: false + feature_properties: + values: '' row: type: fields options: @@ -1652,99 +1674,99 @@ display: display_extenders: views_ef_fieldset: views_ef_fieldset: - enabled: 0 + enabled: false options: sort: root: container_type: details - title: Filtres - description: '' - open: '1' - weight: '0' - id: root - pid: '' depth: '0' + description: '' + id: root + open: true + pid: '' + title: Filtres type: container + weight: '0' title: - weight: '-10' + depth: '1' id: title pid: root - depth: '1' type: filter + weight: '-10' field_incube_value: - weight: '-8' + depth: '1' id: field_incube_value pid: root - depth: '1' type: filter - field_neuf_rehabilitation_value: weight: '-8' + field_neuf_rehabilitation_value: + depth: '1' id: field_neuf_rehabilitation_value pid: root - depth: '1' type: filter - field_encours_fini_value: weight: '-8' + field_encours_fini_value: + depth: '1' id: field_encours_fini_value pid: root - depth: '1' type: filter - submit: weight: '-8' + submit: + depth: '1' id: submit pid: root - depth: '1' type: buttons + weight: '-8' container-0: container_type: details - title: 'Container 0' - description: '' - weight: '-7' - open: 0 - id: container-0 - pid: root depth: '1' + description: '' + id: container-0 + open: false + pid: root + title: 'Container 0' type: container + weight: '-7' container-1: container_type: details - title: 'Container 1' - description: '' - weight: '-6' - open: 0 - id: container-1 - pid: root depth: '1' + description: '' + id: container-1 + open: false + pid: root + title: 'Container 1' type: container + weight: '-6' container-4: container_type: details - title: 'Container 4' - description: '' - weight: '-5' - open: 0 - id: container-4 - pid: root depth: '1' + description: '' + id: container-4 + open: false + pid: root + title: 'Container 4' type: container + weight: '-5' container-2: container_type: details - title: 'Container 2' - description: '' - weight: '-5' - open: 0 - id: container-2 - pid: root depth: '1' + description: '' + id: container-2 + open: false + pid: root + title: 'Container 2' type: container + weight: '-5' container-3: container_type: details - title: 'Container 3' - description: '' - weight: '-4' - open: 0 - id: container-3 - pid: root depth: '1' + description: '' + id: container-3 + open: false + pid: root + title: 'Container 3' type: container + weight: '-4' block_description: 'Projets incubés block' cache_metadata: max-age: -1 @@ -1901,83 +1923,83 @@ display: display_extenders: views_ef_fieldset: views_ef_fieldset: - enabled: 0 + enabled: false options: sort: root: container_type: details - title: Filtres - description: '' - open: '1' - weight: '0' - id: root - pid: '' depth: '0' + description: '' + id: root + open: true + pid: '' + title: Filtres type: container + weight: '0' field_incube_value: - weight: '-8' + depth: '1' id: field_incube_value pid: root - depth: '1' type: filter - field_neuf_rehabilitation_value: weight: '-8' + field_neuf_rehabilitation_value: + depth: '1' id: field_neuf_rehabilitation_value pid: root - depth: '1' type: filter - field_encours_fini_value: weight: '-8' + field_encours_fini_value: + depth: '1' id: field_encours_fini_value pid: root - depth: '1' type: filter - submit: weight: '-8' + submit: + depth: '1' id: submit pid: root - depth: '1' type: buttons + weight: '-8' container-0: container_type: details - title: 'Container 0' - description: '' - weight: '-7' - open: 0 - id: container-0 - pid: root depth: '1' + description: '' + id: container-0 + open: false + pid: root + title: 'Container 0' type: container + weight: '-7' container-1: container_type: details - title: 'Container 1' - description: '' - weight: '-6' - open: 0 - id: container-1 - pid: root depth: '1' + description: '' + id: container-1 + open: false + pid: root + title: 'Container 1' type: container + weight: '-6' container-2: container_type: details - title: 'Container 2' - description: '' - weight: '-5' - open: 0 - id: container-2 - pid: root depth: '1' + description: '' + id: container-2 + open: false + pid: root + title: 'Container 2' type: container + weight: '-5' container-3: container_type: details - title: 'Container 3' - description: '' - weight: '-4' - open: 0 - id: container-3 - pid: root depth: '1' + description: '' + id: container-3 + open: false + pid: root + title: 'Container 3' type: container + weight: '-4' block_description: 'Projets home block' cache_metadata: max-age: -1