From bb6572ef2fe970dfd60371fe8ffa53bd36888deb Mon Sep 17 00:00:00 2001 From: bach Date: Mon, 28 Feb 2022 12:27:11 +0100 Subject: [PATCH] created the map for projetcs --- composer.json | 3 + composer.lock | 184 +++++++++++- ...entity_view_display.node.projet.teaser.yml | 11 +- config/sync/core.extension.yml | 4 + ....page_variant.projets-panels_variant-0.yml | 13 +- config/sync/views.view.projets.yml | 283 +++++++++++++++++- 6 files changed, 491 insertions(+), 7 deletions(-) diff --git a/composer.json b/composer.json index 85752a5..14f9f67 100644 --- a/composer.json +++ b/composer.json @@ -28,6 +28,9 @@ "drupal/geofield": "^1.36", "drupal/image_delta_formatter": "^1.1", "drupal/image_field_caption": "^1.1", + "drupal/leaflet": "^2.1", + "drupal/leaflet_more_maps": "^2.1", + "drupal/leaflet_more_markers": "^1.1", "drupal/linked_field": "^1.3", "drupal/manage_display": "1.x-dev@dev", "drupal/page_manager": "4.x-dev@dev", diff --git a/composer.lock b/composer.lock index 87efe9e..23d1a52 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": "471faaf421c9f203532a12c58d4c62b9", + "content-hash": "3103e49e1d043d23aba96d4e19abe16d", "packages": [ { "name": "alchemy/zippy", @@ -6633,6 +6633,188 @@ "irc": "irc://irc.freenode.org/drupal-contribute" } }, + { + "name": "drupal/leaflet", + "version": "2.1.20", + "source": { + "type": "git", + "url": "https://git.drupalcode.org/project/leaflet.git", + "reference": "2.1.20" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/leaflet-2.1.20.zip", + "reference": "2.1.20", + "shasum": "fd473626341bd83f55e80530ba08b7ce55ddafc7" + }, + "require": { + "drupal/core": "^8.8 || ^9", + "drupal/geofield": "^1.31" + }, + "type": "drupal-module", + "extra": { + "drupal": { + "version": "2.1.20", + "datestamp": "1643578866", + "security-coverage": { + "status": "covered", + "message": "Covered by Drupal's security advisory policy" + } + } + }, + "notification-url": "https://packages.drupal.org/8/downloads", + "license": [ + "GPL-2.0+" + ], + "authors": [ + { + "name": "Italo Mairo", + "homepage": "https://www.drupal.org/u/itamair", + "role": "Maintainer" + }, + { + "name": "Peter Vanhee (pvhee)", + "homepage": "https://www.drupal.org/u/pvhee", + "role": "Maintainer" + }, + { + "name": "Rik de Boer (RdeBoer)", + "homepage": "https://www.drupal.org/u/rdeboer", + "role": "Maintainer" + }, + { + "name": "Gabriel Carleton-Barnes (gcb)", + "homepage": "https://www.drupal.org/u/gcb", + "role": "Maintainer" + }, + { + "name": "Lev Tsypin (levelos)", + "homepage": "https://www.drupal.org/u/levelos", + "role": "Maintainer" + }, + { + "name": "Sean Larkin (seanberto)", + "homepage": "https://www.drupal.org/u/seanberto", + "role": "Maintainer" + } + ], + "description": "Integration with the Leaflet map scripting library.", + "homepage": "https://www.drupal.org/project/leaflet", + "support": { + "source": "https://git.drupalcode.org/project/leaflet", + "issues": "https://www.drupal.org/project/issues/leaflet" + } + }, + { + "name": "drupal/leaflet_more_maps", + "version": "2.1.2", + "source": { + "type": "git", + "url": "https://git.drupalcode.org/project/leaflet_more_maps.git", + "reference": "2.1.2" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/leaflet_more_maps-2.1.2.zip", + "reference": "2.1.2", + "shasum": "3318ee031385caae435e4f835d6f8d6e823be3d9" + }, + "require": { + "drupal/core": "^8.8 || ^9", + "drupal/leaflet": "^2.1.0" + }, + "require-dev": { + "drupal/leaflet": "*" + }, + "type": "drupal-module", + "extra": { + "drupal": { + "version": "2.1.2", + "datestamp": "1621187674", + "security-coverage": { + "status": "covered", + "message": "Covered by Drupal's security advisory policy" + } + }, + "branch-alias": { + "dev-8.x-1.x": "1.x-dev" + } + }, + "notification-url": "https://packages.drupal.org/8/downloads", + "license": [ + "GPL-2.0-or-later" + ], + "authors": [ + { + "name": "RdeBoer", + "homepage": "https://www.drupal.org/user/404007" + }, + { + "name": "berramou", + "homepage": "https://www.drupal.org/user/3535998" + }, + { + "name": "japerry", + "homepage": "https://www.drupal.org/user/45640" + }, + { + "name": "rachel_norfolk", + "homepage": "https://www.drupal.org/user/66273" + } + ], + "description": "Adds a swag of map styles to Leaflet, e.g Thunderforest, Esri, Stamen, Google.", + "homepage": "https://www.drupal.org/project/leaflet_more_maps", + "support": { + "source": "https://git.drupalcode.org/project/leaflet_more_maps", + "issues": "https://www.drupal.org/project/issues/leaflet_more_maps" + } + }, + { + "name": "drupal/leaflet_more_markers", + "version": "1.1.1", + "source": { + "type": "git", + "url": "https://git.drupalcode.org/project/leaflet_more_markers.git", + "reference": "1.1.1" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/leaflet_more_markers-1.1.1.zip", + "reference": "1.1.1", + "shasum": "5ef86ae1b673375081e0cffb4c912c0064ccc3b3" + }, + "require": { + "drupal/core": "^8.8 || ^9", + "drupal/leaflet": "*", + "drupal/token": "*" + }, + "type": "drupal-module", + "extra": { + "drupal": { + "version": "1.1.1", + "datestamp": "1612917907", + "security-coverage": { + "status": "covered", + "message": "Covered by Drupal's security advisory policy" + } + } + }, + "notification-url": "https://packages.drupal.org/8/downloads", + "license": [ + "GPL-2.0-or-later" + ], + "authors": [ + { + "name": "RdeBoer", + "homepage": "https://www.drupal.org/user/404007" + } + ], + "description": "Allows every location to feature its own emoji marker or font icon.", + "homepage": "https://www.drupal.org/project/leaflet_more_markers", + "support": { + "source": "https://git.drupalcode.org/project/leaflet_more_markers" + } + }, { "name": "drupal/link_attributes", "version": "1.11.0", diff --git a/config/sync/core.entity_view_display.node.projet.teaser.yml b/config/sync/core.entity_view_display.node.projet.teaser.yml index e511f91..d59a104 100644 --- a/config/sync/core.entity_view_display.node.projet.teaser.yml +++ b/config/sync/core.entity_view_display.node.projet.teaser.yml @@ -19,6 +19,7 @@ dependencies: - image.style.large - node.type.projet module: + - address - image - manage_display id: node.projet.teaser @@ -26,6 +27,13 @@ targetEntityType: node bundle: projet mode: teaser content: + field_adresse: + type: address_default + label: hidden + settings: { } + third_party_settings: { } + weight: 2 + region: content field_incube: type: boolean label: hidden @@ -34,7 +42,7 @@ content: format_custom_false: '' format_custom_true: 'Projet Incubé' third_party_settings: { } - weight: 2 + weight: 3 region: content field_photo: type: image @@ -57,7 +65,6 @@ content: hidden: body: true created: true - field_adresse: true field_encours_fini: true field_fichiers: true field_geofield: true diff --git a/config/sync/core.extension.yml b/config/sync/core.extension.yml index 381be9f..8789b50 100644 --- a/config/sync/core.extension.yml +++ b/config/sync/core.extension.yml @@ -76,6 +76,10 @@ module: jquery_ui_touch_punch: 0 language: 0 layout_discovery: 0 + leaflet: 0 + leaflet_more_maps: 0 + leaflet_more_markers: 0 + leaflet_views: 0 link: 0 link_attributes: 0 linkit: 0 diff --git a/config/sync/page_manager.page_variant.projets-panels_variant-0.yml b/config/sync/page_manager.page_variant.projets-panels_variant-0.yml index 8c8d053..0fc73a8 100644 --- a/config/sync/page_manager.page_variant.projets-panels_variant-0.yml +++ b/config/sync/page_manager.page_variant.projets-panels_variant-0.yml @@ -39,8 +39,19 @@ variant_settings: views_label: '' items_per_page: none region: content - weight: 0 + weight: 1 uuid: 7d84722e-f334-4132-a068-73fc79a93e42 + d7d63a49-2743-4d5f-8808-8d395566c9ba: + id: 'views_block:projets-block_2' + label: '' + label_display: '0' + provider: views + context_mapping: { } + views_label: '' + items_per_page: none + region: content + weight: -1 + uuid: d7d63a49-2743-4d5f-8808-8d395566c9ba page_title: '' layout: layout_onecol layout_settings: diff --git a/config/sync/views.view.projets.yml b/config/sync/views.view.projets.yml index 65f5f48..f1ce1fa 100644 --- a/config/sync/views.view.projets.yml +++ b/config/sync/views.view.projets.yml @@ -4,9 +4,12 @@ status: true dependencies: config: - core.entity_view_mode.node.teaser + - field.storage.node.field_geofield - node.type.projet module: - better_exposed_filters + - geofield + - leaflet_views - node - options - user @@ -73,6 +76,70 @@ display: multi_type: separator separator: ', ' field_api_classes: false + field_geofield: + id: field_geofield + table: node__field_geofield + field: field_geofield + relationship: none + group_type: group + admin_label: '' + plugin_id: field + label: '' + exclude: true + alter: + alter_text: false + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: false + trim: false + preserve_tags: '' + html: false + element_type: '' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: false + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + click_sort_column: value + type: geofield_default + settings: + output_format: wkt + output_escape: true + group_column: value + group_columns: { } + group_rows: true + delta_limit: 0 + delta_offset: 0 + delta_reversed: false + delta_first_last: false + multi_type: separator + separator: ', ' + field_api_classes: false pager: type: none options: @@ -358,7 +425,74 @@ display: groups: 1: AND style: - type: default + type: leaflet_map + options: + grouping: { } + data_source: field_geofield + entity_source: __base_table + name_field: title + description_field: '' + view_mode: full + leaflet_map: 'OSM Mapnik' + height: '400' + height_unit: px + hide_empty_map: false + disable_wheel: false + gesture_handling: false + reset_map: + control: false + position: topright + map_position: + force: false + center: + lat: !!float 0 + lon: !!float 0 + zoom: 12 + minZoom: 1 + maxZoom: 18 + zoomFiner: 0 + weight: '' + icon: + iconType: marker + iconUrl: '' + shadowUrl: '' + className: '' + iconSize: + x: '' + 'y': '' + iconAnchor: + x: '' + 'y': '' + shadowSize: + x: '' + 'y': '' + shadowAnchor: + x: '' + 'y': '' + popupAnchor: + x: '' + 'y': '' + html: '
' + html_class: leaflet-map-divicon + circle_marker_options: '{"radius":100,"color":"red","fillColor":"#f03","fillOpacity":0.5}' + fullscreen: + control: false + options: '{"position":"topleft","pseudoFullscreen":false}' + path: '{"color":"#3388ff","opacity":"1.0","stroke":true,"weight":3,"fill":"depends","fillColor":"*","fillOpacity":"0.2","radius":"6"}' + geocoder: + control: false + settings: + position: topright + input_size: 25 + providers: + mapquest: + weight: '0' + checked: 0 + min_terms: 4 + delay: 800 + zoom: 16 + popup: false + options: '' row: type: 'entity:node' options: @@ -383,13 +517,27 @@ display: - url - 'user.node_grants:view' - user.permissions - tags: { } + tags: + - 'config:field.storage.node.field_geofield' block_1: id: block_1 display_title: 'Projets Block' display_plugin: block position: 1 display_options: + style: + type: default + options: + row_class: '' + default_row_class: true + uses_fields: false + row: + type: 'entity:node' + options: + view_mode: teaser + defaults: + style: false + row: false display_description: '' display_extenders: views_ef_fieldset: @@ -496,4 +644,133 @@ display: - url - 'user.node_grants:view' - user.permissions - tags: { } + tags: + - 'config:field.storage.node.field_geofield' + block_2: + id: block_2 + display_title: 'Projets map' + display_plugin: block + position: 2 + display_options: + filters: + status: + id: status + table: node_field_data + field: status + entity_type: node + entity_field: status + plugin_id: boolean + value: '1' + group: 1 + expose: + operator: '' + operator_limit_selection: false + operator_list: { } + type: + id: type + table: node_field_data + field: type + entity_type: node + entity_field: type + plugin_id: bundle + value: + projet: projet + group: 1 + expose: + operator_limit_selection: false + operator_list: { } + filter_groups: + operator: AND + groups: + 1: AND + style: + type: leaflet_map + options: + grouping: { } + data_source: field_geofield + entity_source: __base_table + name_field: title + description_field: '' + view_mode: full + leaflet_map: stamen-toner-lite + height: '400' + height_unit: px + hide_empty_map: false + disable_wheel: false + gesture_handling: false + reset_map: + control: false + position: topright + map_position: + force: false + center: + lat: !!float 0 + lon: !!float 0 + zoom: 12 + minZoom: 1 + maxZoom: 18 + zoomFiner: 0 + weight: '' + icon: + iconType: marker + iconUrl: '' + shadowUrl: '' + className: '' + iconSize: + x: '' + 'y': '' + iconAnchor: + x: '' + 'y': '' + shadowSize: + x: '' + 'y': '' + shadowAnchor: + x: '' + 'y': '' + popupAnchor: + x: '' + 'y': '' + html: '
' + html_class: leaflet-map-divicon + circle_marker_options: '{"radius":100,"color":"red","fillColor":"#f03","fillOpacity":0.5}' + fullscreen: + control: false + options: '{"position":"topleft","pseudoFullscreen":false}' + path: '{"color":"#3388ff","opacity":"1.0","stroke":true,"weight":3,"fill":"depends","fillColor":"*","fillOpacity":"0.2","radius":"6"}' + geocoder: + control: false + settings: + position: topright + input_size: 25 + providers: + mapquest: + weight: '0' + checked: 0 + min_terms: 4 + delay: 800 + zoom: 16 + popup: false + options: '' + row: + type: 'entity:node' + options: + view_mode: teaser + defaults: + style: false + row: false + filters: false + filter_groups: false + display_description: '' + display_extenders: + views_ef_fieldset: { } + block_description: 'Projet Map' + cache_metadata: + max-age: -1 + contexts: + - 'languages:language_content' + - 'languages:language_interface' + - 'user.node_grants:view' + - user.permissions + tags: + - 'config:field.storage.node.field_geofield'