diff --git a/composer.json b/composer.json
index 665853d..397769d 100644
--- a/composer.json
+++ b/composer.json
@@ -14,13 +14,13 @@
"drupal/field_formatter_class": "^1.4",
"drupal/field_group": "^3.0",
"drupal/fontawesome": "^2.18",
- "drupal/geolocation": "^3.1",
"drupal/layout_paragraphs": "^2.0",
"drupal/office_hours": "^1.8",
"drupal/paragraphs": "^1.13",
"drupal/tablefield": "^2.3",
"drupal/viewsreference": "^2.0",
"localgovdrupal/localgov_core": "^2.12",
+ "localgovdrupal/localgov_geo": "^2.0",
"localgovdrupal/localgov_topics": "^1.0"
},
"extra": {
diff --git a/config/install/core.entity_form_display.paragraph.localgov_contact.default.yml b/config/install/core.entity_form_display.paragraph.localgov_contact.default.yml
index 1d79345..db3cabc 100644
--- a/config/install/core.entity_form_display.paragraph.localgov_contact.default.yml
+++ b/config/install/core.entity_form_display.paragraph.localgov_contact.default.yml
@@ -2,12 +2,11 @@ langcode: en
status: true
dependencies:
config:
- - field.field.paragraph.localgov_contact.localgov_contact_address
+ - entity_browser.browser.geo_entity_library
- field.field.paragraph.localgov_contact.localgov_contact_email
- field.field.paragraph.localgov_contact.localgov_contact_facebook
- field.field.paragraph.localgov_contact.localgov_contact_heading
- field.field.paragraph.localgov_contact.localgov_contact_instagram
- - field.field.paragraph.localgov_contact.localgov_contact_location
- field.field.paragraph.localgov_contact.localgov_contact_minicom
- field.field.paragraph.localgov_contact.localgov_contact_mobile
- field.field.paragraph.localgov_contact.localgov_contact_office_hours
@@ -18,11 +17,11 @@ dependencies:
- field.field.paragraph.localgov_contact.localgov_contact_subheading
- field.field.paragraph.localgov_contact.localgov_contact_twitter
- field.field.paragraph.localgov_contact.localgov_contact_url
+ - field.field.paragraph.localgov_contact.localgov_location
- paragraphs.paragraphs_type.localgov_contact
module:
- - address
+ - entity_browser
- field_group
- - geolocation_leaflet
- link
- office_hours
- telephone
@@ -37,9 +36,9 @@ third_party_settings:
- group_office_detail
- group_location
label: Tabs
- region: hidden
+ region: content
parent_name: ''
- weight: 20
+ weight: 0
format_type: tabs
format_settings:
classes: ''
@@ -52,7 +51,7 @@ third_party_settings:
- localgov_contact_out_of_hours
- localgov_contact_minicom
label: Telephone
- region: hidden
+ region: content
parent_name: group_contact_tabs
weight: 22
format_type: tab
@@ -68,7 +67,7 @@ third_party_settings:
- localgov_contact_url
- localgov_contact_other_url
label: 'Email and website'
- region: hidden
+ region: content
parent_name: group_contact_tabs
weight: 21
format_type: tab
@@ -85,7 +84,7 @@ third_party_settings:
- localgov_contact_twitter
- localgov_contact_other_social
label: 'Social media'
- region: hidden
+ region: content
parent_name: group_contact_tabs
weight: 23
format_type: tab
@@ -97,24 +96,25 @@ third_party_settings:
required_fields: true
group_office_detail:
children:
- - localgov_contact_address
- localgov_contact_office_hours
- label: 'Office address and hours'
- region: hidden
+ label: 'Office hours'
+ region: content
parent_name: group_contact_tabs
weight: 24
format_type: tab
format_settings:
classes: ''
+ show_empty_fields: false
id: ''
+ label_as_html: false
formatter: closed
description: ''
required_fields: true
group_location:
children:
- - localgov_contact_location
+ - localgov_location
label: Location
- region: hidden
+ region: content
parent_name: group_contact_tabs
weight: 25
format_type: tab
@@ -129,7 +129,7 @@ third_party_settings:
- localgov_contact_heading
- localgov_contact_subheading
label: Description
- region: hidden
+ region: content
parent_name: group_contact_tabs
weight: 20
format_type: tab
@@ -144,13 +144,6 @@ targetEntityType: paragraph
bundle: localgov_contact
mode: default
content:
- localgov_contact_address:
- type: address_default
- weight: 35
- region: content
- settings:
- wrapper_type: fieldset
- third_party_settings: { }
localgov_contact_email:
type: email_default
weight: 1
@@ -161,7 +154,7 @@ content:
third_party_settings: { }
localgov_contact_facebook:
type: link_default
- weight: 38
+ weight: 4
region: content
settings:
placeholder_url: ''
@@ -169,7 +162,7 @@ content:
third_party_settings: { }
localgov_contact_heading:
type: string_textfield
- weight: 33
+ weight: 8
region: content
settings:
size: 60
@@ -177,605 +170,36 @@ content:
third_party_settings: { }
localgov_contact_instagram:
type: link_default
- weight: 39
+ weight: 5
region: content
settings:
placeholder_url: ''
placeholder_title: ''
third_party_settings: { }
- localgov_contact_location:
- type: geolocation_leaflet
- weight: 37
- region: content
- settings:
- auto_client_location: ''
- auto_client_location_marker: '0'
- allow_override_map_settings: 0
- hide_textfield_form: false
- centre:
- fixed_value:
- enable: true
- weight: 0
- settings:
- location_option_id: fixed_value
- latitude: 54.572
- longitude: -4.8339
- map_center_id: location_plugins
- ipstack:
- enable: false
- weight: 0
- settings:
- location_option_id: ipstack
- access_key: ''
- map_center_id: location_plugins
- fixed_boundaries:
- enable: false
- weight: 0
- settings:
- south: ''
- west: ''
- north: ''
- east: ''
- map_center_id: fixed_boundaries
- client_location:
- enable: false
- weight: 0
- map_center_id: client_location
- fit_bounds:
- enable: false
- weight: 0
- settings:
- reset_zoom: false
- min_zoom: null
- map_center_id: fit_bounds
- leaflet_settings:
- map_features:
- leaflet_control_geocoder:
- weight: -100
- settings:
- position: topright
- geocoder: google_geocoding_api
- settings:
- label: Address
- description: 'Enter an address to be localized.'
- autocomplete_min_length: 1
- component_restrictions:
- route: ''
- country: ''
- administrative_area: ''
- locality: ''
- postal_code: ''
- boundary_restriction:
- south: ''
- west: ''
- north: ''
- east: ''
- region: ''
- enabled: true
- leaflet_client_location_indicator:
- weight: 0
- enabled: false
- leaflet_disable_user_interaction:
- weight: 0
- enabled: false
- geolocation_shapes:
- weight: 0
- settings:
- remove_markers: false
- polyline: true
- polyline_title: ''
- strokeColor: '#FF0000'
- strokeOpacity: 0.8
- strokeWidth: '2'
- polygon: false
- polygon_title: ''
- fillColor: '#FF0000'
- fillOpacity: 0.35
- enabled: false
- leaflet_gesture_handling:
- weight: 0
- enabled: false
- leaflet_rotate:
- weight: 0
- settings:
- display_control: true
- bearing: 0.0
- enabled: false
- leaflet_control_attribution:
- weight: 0
- settings:
- position: bottomright
- prefix: Leaflet
- enabled: true
- leaflet_control_fullscreen:
- weight: 0
- settings:
- position: topright
- enabled: false
- leaflet_control_locate:
- weight: 0
- settings:
- position: topright
- enabled: false
- leaflet_control_recenter:
- weight: 0
- settings:
- position: topright
- enabled: false
- leaflet_control_scale:
- weight: 0
- settings:
- position: topright
- metric: true
- imperial: true
- enabled: false
- leaflet_control_layer:
- weight: 0
- settings:
- position: topright
- default_label: Default
- tile_layer_providers:
- OpenStreetMap:
- 'OpenStreetMap Mapnik':
- checkbox: false
- label: ''
- 'OpenStreetMap BlackAndWhite':
- checkbox: false
- label: ''
- 'OpenStreetMap DE':
- checkbox: false
- label: ''
- 'OpenStreetMap CH':
- checkbox: false
- label: ''
- 'OpenStreetMap France':
- checkbox: false
- label: ''
- 'OpenStreetMap HOT':
- checkbox: false
- label: ''
- 'OpenStreetMap BZH':
- checkbox: false
- label: ''
- OpenTopoMap:
- OpenTopoMap:
- checkbox: false
- label: ''
- Thunderforest:
- 'Thunderforest OpenCycleMap':
- checkbox: false
- label: ''
- 'Thunderforest Transport':
- checkbox: false
- label: ''
- 'Thunderforest TransportDark':
- checkbox: false
- label: ''
- 'Thunderforest SpinalMap':
- checkbox: false
- label: ''
- 'Thunderforest Landscape':
- checkbox: false
- label: ''
- 'Thunderforest Outdoors':
- checkbox: false
- label: ''
- 'Thunderforest Pioneer':
- checkbox: false
- label: ''
- OpenMapSurfer:
- 'OpenMapSurfer Roads':
- checkbox: false
- label: ''
- 'OpenMapSurfer Grayscale':
- checkbox: false
- label: ''
- Hydda:
- 'Hydda Full':
- checkbox: false
- label: ''
- 'Hydda Base':
- checkbox: false
- label: ''
- MapBox:
- MapBox:
- checkbox: false
- label: ''
- Stamen:
- 'Stamen Toner':
- checkbox: false
- label: ''
- 'Stamen TonerBackground':
- checkbox: false
- label: ''
- 'Stamen TonerLite':
- checkbox: false
- label: ''
- 'Stamen Watercolor':
- checkbox: false
- label: ''
- 'Stamen Terrain':
- checkbox: false
- label: ''
- 'Stamen TerrainBackground':
- checkbox: false
- label: ''
- 'Stamen TopOSMRelief':
- checkbox: false
- label: ''
- Esri:
- 'Esri WorldStreetMap':
- checkbox: false
- label: ''
- 'Esri DeLorme':
- checkbox: false
- label: ''
- 'Esri WorldTopoMap':
- checkbox: false
- label: ''
- 'Esri WorldImagery':
- checkbox: false
- label: ''
- 'Esri WorldTerrain':
- checkbox: false
- label: ''
- 'Esri WorldShadedRelief':
- checkbox: false
- label: ''
- 'Esri WorldPhysical':
- checkbox: false
- label: ''
- 'Esri OceanBasemap':
- checkbox: false
- label: ''
- 'Esri NatGeoWorldMap':
- checkbox: false
- label: ''
- 'Esri WorldGrayCanvas':
- checkbox: false
- label: ''
- HERE:
- 'HERE normalDay':
- checkbox: false
- label: ''
- 'HERE normalDayCustom':
- checkbox: false
- label: ''
- 'HERE normalDayGrey':
- checkbox: false
- label: ''
- 'HERE normalDayMobile':
- checkbox: false
- label: ''
- 'HERE normalDayGreyMobile':
- checkbox: false
- label: ''
- 'HERE normalDayTransit':
- checkbox: false
- label: ''
- 'HERE normalDayTransitMobile':
- checkbox: false
- label: ''
- 'HERE normalNight':
- checkbox: false
- label: ''
- 'HERE normalNightMobile':
- checkbox: false
- label: ''
- 'HERE normalNightGrey':
- checkbox: false
- label: ''
- 'HERE normalNightGreyMobile':
- checkbox: false
- label: ''
- 'HERE normalNightTransit':
- checkbox: false
- label: ''
- 'HERE normalNightTransitMobile':
- checkbox: false
- label: ''
- 'HERE redcuedDay':
- checkbox: false
- label: ''
- 'HERE redcuedNight':
- checkbox: false
- label: ''
- 'HERE basicMap':
- checkbox: false
- label: ''
- 'HERE mapLabels':
- checkbox: false
- label: ''
- 'HERE trafficFlow':
- checkbox: false
- label: ''
- 'HERE carnavDayGrey':
- checkbox: false
- label: ''
- 'HERE hybridDayMobile':
- checkbox: false
- label: ''
- 'HERE hybridDayTransit':
- checkbox: false
- label: ''
- 'HERE hybridDayGrey':
- checkbox: false
- label: ''
- 'HERE pedestrianDay':
- checkbox: false
- label: ''
- 'HERE pedestrianNight':
- checkbox: false
- label: ''
- 'HERE satelliteDay':
- checkbox: false
- label: ''
- 'HERE terrainDay':
- checkbox: false
- label: ''
- 'HERE terrainDayMobile':
- checkbox: false
- label: ''
- FreeMapSK:
- FreeMapSK:
- checkbox: false
- label: ''
- MtbMap:
- MtbMap:
- checkbox: false
- label: ''
- CartoDB:
- 'CartoDB Positron':
- checkbox: false
- label: ''
- 'CartoDB PositronNoLabels':
- checkbox: false
- label: ''
- 'CartoDB PositronOnlyLabels':
- checkbox: false
- label: ''
- 'CartoDB DarkMatter':
- checkbox: false
- label: ''
- 'CartoDB DarkMatterNoLabels':
- checkbox: false
- label: ''
- 'CartoDB DarkMatterOnlyLabels':
- checkbox: false
- label: ''
- 'CartoDB Voyager':
- checkbox: false
- label: ''
- 'CartoDB VoyagerNoLabels':
- checkbox: false
- label: ''
- 'CartoDB VoyagerOnlyLabels':
- checkbox: false
- label: ''
- 'CartoDB VoyagerLabelsUnder':
- checkbox: false
- label: ''
- HikeBike:
- HikeBike:
- checkbox: false
- label: ''
- 'HikeBike HillShading':
- checkbox: false
- label: ''
- BasemapAT:
- 'BasemapAT basemap':
- checkbox: false
- label: ''
- 'BasemapAT grau':
- checkbox: false
- label: ''
- 'BasemapAT overlay':
- checkbox: false
- label: ''
- 'BasemapAT highdpi':
- checkbox: false
- label: ''
- 'BasemapAT orthofoto':
- checkbox: false
- label: ''
- NLS:
- NLS:
- checkbox: false
- label: ''
- GeoportailFrance:
- 'GeoportailFrance parcels':
- checkbox: false
- label: ''
- 'GeoportailFrance ignMaps':
- checkbox: false
- label: ''
- 'GeoportailFrance maps':
- checkbox: false
- label: ''
- 'GeoportailFrance orthos':
- checkbox: false
- label: ''
- tile_providers_options:
- Thunderforest:
- apikey: ''
- MapBox:
- accessToken: ''
- HERE:
- app_id: ''
- app_code: ''
- GeoportailFrance:
- apikey: ''
- enabled: false
- leaflet_control_zoom:
- weight: 0
- settings:
- position: topright
- enabled: true
- leaflet_marker_clusterer:
- weight: 0
- settings:
- cluster_settings:
- show_coverage_on_hover: true
- zoom_to_bounds_on_click: true
- disable_clustering_at_zoom: 0
- custom_marker_settings: ''
- enabled: false
- leaflet_marker_icon:
- weight: 0
- settings:
- marker_shadow_path: ''
- marker_icon_path: ''
- icon_size:
- width: null
- height: null
- icon_anchor:
- x: null
- 'y': null
- popup_anchor:
- x: 0
- 'y': 0
- shadow_size:
- width: null
- height: null
- shadow_anchor:
- x: null
- 'y': null
- enabled: false
- leaflet_marker_popup:
- weight: 0
- settings:
- info_auto_display: false
- max_width: 300
- min_width: 50
- max_height: 0
- auto_pan: true
- keep_in_view: false
- close_button: true
- auto_close: true
- close_on_escape_key: true
- class_name: ''
- enabled: true
- geolocation_marker_scroll_to_id:
- weight: 0
- settings:
- scroll_target_id: ''
- enabled: false
- leaflet_marker_zoom_and_animate:
- weight: 0
- settings:
- marker_zoom_anchor_id: ''
- enabled: false
- leaflet_max_bounds:
- weight: 0
- settings:
- north: null
- south: null
- east: null
- west: null
- enabled: false
- leaflet_custom_tile_layer:
- weight: 0
- settings:
- tile_layer_url: '//{s}.tile.osm.org/{z}/{x}/{y}.png'
- tile_layer_attribution: '© OpenStreetMap contributors'
- tile_layer_subdomains: abc
- tile_layer_zoom: 18
- enabled: false
- leaflet_tile_layer_overlay:
- weight: 0
- settings:
- tile_layer_overlay: OpenInfraMap.Power
- enabled: false
- leaflet_tile_layer:
- weight: 0
- settings:
- tile_layer_provider: 'OpenStreetMap Mapnik'
- tile_provider_options:
- Thunderforest:
- apikey: ''
- MapBox:
- accessToken: ''
- HERE:
- app_id: ''
- app_code: ''
- GeoportailFrance:
- apikey: ''
- enabled: false
- leaflet_wms:
- weight: 0
- settings:
- url: ''
- version: 1.1.1
- layers: ''
- styles: ''
- srs: ''
- format: image/jpeg
- transparent: false
- identify: false
- enabled: false
- zoom: '5'
- height: 400px
- width: 100%
- minZoom: '0'
- maxZoom: '0'
- maxBounds:
- north_east_bound:
- lat: null
- lng: null
- south_west_bound:
- lat: null
- lng: null
- crs: EPSG3857
- preferCanvas: false
- zoomSnap: 1
- zoomDelta: 1
- trackResize: true
- boxZoom: true
- doubleClickZoom: true
- dragging: true
- zoomAnimation: true
- zoomAnimationThreshold: 4
- fadeAnimation: true
- markerZoomAnimation: true
- inertia: false
- inertiaDeceleration: 3000
- easeLinearity: 0.2
- worldCopyJump: false
- maxBoundsViscosity: 0.0
- keyboard: true
- keyboardPanDelta: 80
- scrollWheelZoom: true
- wheelDebounceTime: 40
- wheelPxPerZoomLevel: 60
- tap: true
- tapTolerance: 15
- touchZoom: true
- bounceAtZoomLimits: true
- third_party_settings: { }
localgov_contact_minicom:
type: telephone_default
- weight: 31
+ weight: 13
region: content
settings:
placeholder: ''
third_party_settings: { }
localgov_contact_mobile:
type: telephone_default
- weight: 29
+ weight: 11
region: content
settings:
placeholder: ''
third_party_settings: { }
localgov_contact_office_hours:
type: office_hours_default
- weight: 36
+ weight: 15
region: content
settings:
collapsed: false
third_party_settings: { }
localgov_contact_other_social:
type: link_default
- weight: 41
+ weight: 7
region: content
settings:
placeholder_url: ''
@@ -791,21 +215,21 @@ content:
third_party_settings: { }
localgov_contact_out_of_hours:
type: telephone_default
- weight: 30
+ weight: 12
region: content
settings:
placeholder: ''
third_party_settings: { }
localgov_contact_phone:
type: telephone_default
- weight: 28
+ weight: 10
region: content
settings:
placeholder: ''
third_party_settings: { }
localgov_contact_subheading:
type: string_textfield
- weight: 34
+ weight: 9
region: content
settings:
size: 60
@@ -813,7 +237,7 @@ content:
third_party_settings: { }
localgov_contact_twitter:
type: link_default
- weight: 40
+ weight: 6
region: content
settings:
placeholder_url: ''
@@ -827,6 +251,20 @@ content:
placeholder_url: ''
placeholder_title: ''
third_party_settings: { }
+ localgov_location:
+ type: entity_browser_entity_reference
+ weight: 0
+ region: content
+ settings:
+ entity_browser: geo_entity_library
+ field_widget_display: label
+ field_widget_edit: true
+ field_widget_remove: true
+ field_widget_replace: false
+ open: true
+ field_widget_display_settings: { }
+ selection_mode: selection_append
+ third_party_settings: { }
hidden:
created: true
status: true
diff --git a/config/install/core.entity_view_display.geo_entity.address.localgov_paragraph_contact.yml b/config/install/core.entity_view_display.geo_entity.address.localgov_paragraph_contact.yml
new file mode 100644
index 0000000..048a02c
--- /dev/null
+++ b/config/install/core.entity_view_display.geo_entity.address.localgov_paragraph_contact.yml
@@ -0,0 +1,133 @@
+langcode: en
+status: true
+dependencies:
+ config:
+ - core.entity_view_mode.geo_entity.localgov_paragraph_contact
+ - field.field.geo_entity.address.accessibility
+ - field.field.geo_entity.address.external_id
+ - field.field.geo_entity.address.location
+ - field.field.geo_entity.address.postal_address
+ - geo_entity.geo_entity_type.address
+ module:
+ - leaflet
+ - text
+id: geo_entity.address.localgov_paragraph_contact
+targetEntityType: geo_entity
+bundle: address
+mode: localgov_paragraph_contact
+content:
+ accessibility:
+ type: text_default
+ label: above
+ settings: { }
+ third_party_settings: { }
+ weight: 0
+ region: content
+ location:
+ type: leaflet_formatter_default
+ label: visually_hidden
+ settings:
+ multiple_map: false
+ leaflet_map: 'OSM Mapnik'
+ height: 200
+ height_unit: px
+ hide_empty_map: true
+ disable_wheel: false
+ gesture_handling: false
+ fitbounds_options: '{"padding":[0,0]}'
+ reset_map:
+ control: false
+ 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
+ leaflet_tooltip:
+ value: ''
+ options: '{"permanent":false,"direction":"center"}'
+ popup: false
+ popup_content: ''
+ leaflet_popup:
+ control: '0'
+ content: ''
+ options: '{"maxWidth":"300","minWidth":"50","autoPan":true}'
+ map_position:
+ force: false
+ center:
+ lat: 0.0
+ lon: 0.0
+ zoomControlPosition: topleft
+ zoom: 14
+ minZoom: 10
+ maxZoom: 18
+ zoomFiner: 0
+ 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}'
+ leaflet_markercluster:
+ control: false
+ options: '{"spiderfyOnMaxZoom":true,"showCoverageOnHover":true,"removeOutsideVisibleBounds": false}'
+ excluded: ''
+ include_path: false
+ fullscreen:
+ control: false
+ options: '{"position":"topleft","pseudoFullscreen":false}'
+ path: '{"color":"#3388ff","opacity":"1.0","stroke":true,"weight":3,"fill":"depends","fillColor":"*","fillOpacity":"0.2"}'
+ feature_properties:
+ values: ''
+ geocoder:
+ control: false
+ settings:
+ autocomplete:
+ placeholder: 'Search Address'
+ title: 'Search an Address on the Map'
+ position: topright
+ input_size: 25
+ providers:
+ geo_entity_osm:
+ weight: 0
+ checked: false
+ geo_entity_demo_photon:
+ weight: 0
+ checked: false
+ min_terms: 4
+ delay: 800
+ zoom: 16
+ popup: false
+ options: ''
+ map_lazy_load:
+ lazy_load: false
+ weight: null
+ third_party_settings: { }
+ weight: 1
+ region: content
+hidden:
+ created: true
+ external_id: true
+ postal_address: true
+ search_api_excerpt: true
+ status: true
+ uid: true
diff --git a/config/install/core.entity_view_display.paragraph.localgov_contact.default.yml b/config/install/core.entity_view_display.paragraph.localgov_contact.default.yml
index 42d9219..7db1e1a 100644
--- a/config/install/core.entity_view_display.paragraph.localgov_contact.default.yml
+++ b/config/install/core.entity_view_display.paragraph.localgov_contact.default.yml
@@ -2,12 +2,10 @@ langcode: en
status: true
dependencies:
config:
- - field.field.paragraph.localgov_contact.localgov_contact_address
- field.field.paragraph.localgov_contact.localgov_contact_email
- field.field.paragraph.localgov_contact.localgov_contact_facebook
- field.field.paragraph.localgov_contact.localgov_contact_heading
- field.field.paragraph.localgov_contact.localgov_contact_instagram
- - field.field.paragraph.localgov_contact.localgov_contact_location
- field.field.paragraph.localgov_contact.localgov_contact_minicom
- field.field.paragraph.localgov_contact.localgov_contact_mobile
- field.field.paragraph.localgov_contact.localgov_contact_office_hours
@@ -18,11 +16,9 @@ dependencies:
- field.field.paragraph.localgov_contact.localgov_contact_subheading
- field.field.paragraph.localgov_contact.localgov_contact_twitter
- field.field.paragraph.localgov_contact.localgov_contact_url
- - filter.format.wysiwyg
+ - field.field.paragraph.localgov_contact.localgov_location
- paragraphs.paragraphs_type.localgov_contact
module:
- - address
- - geolocation
- link
- office_hours
- telephone
@@ -31,13 +27,6 @@ targetEntityType: paragraph
bundle: localgov_contact
mode: default
content:
- localgov_contact_address:
- type: address_default
- label: above
- settings: { }
- third_party_settings: { }
- weight: 6
- region: content
localgov_contact_email:
type: email_mailto
label: inline
@@ -77,583 +66,6 @@ content:
third_party_settings: { }
weight: 12
region: content
- localgov_contact_location:
- type: geolocation_map
- label: hidden
- settings:
- set_marker: true
- show_label: false
- common_map: true
- show_delta_label: false
- use_overridden_map_settings: false
- title: ''
- info_text:
- value: ''
- format: wysiwyg
- centre:
- fit_bounds:
- enable: true
- weight: -101
- settings:
- reset_zoom: true
- min_zoom: null
- map_center_id: fit_bounds
- fixed_value:
- enable: false
- weight: 0
- settings:
- location_option_id: fixed_value
- latitude: null
- longitude: null
- map_center_id: location_plugins
- ipstack:
- enable: false
- weight: 0
- settings:
- location_option_id: ipstack
- access_key: ''
- map_center_id: location_plugins
- fixed_boundaries:
- enable: false
- weight: 0
- settings:
- south: ''
- west: ''
- north: ''
- east: ''
- map_center_id: fixed_boundaries
- client_location:
- enable: false
- weight: 0
- map_center_id: client_location
- map_provider_id: leaflet
- map_provider_settings:
- map_features:
- leaflet_client_location_indicator:
- weight: 0
- enabled: false
- leaflet_disable_user_interaction:
- weight: 0
- enabled: false
- geolocation_shapes:
- weight: 0
- settings:
- remove_markers: false
- polyline: true
- polyline_title: ''
- strokeColor: '#FF0000'
- strokeOpacity: 0.8
- strokeWidth: '2'
- polygon: false
- polygon_title: ''
- fillColor: '#FF0000'
- fillOpacity: 0.35
- enabled: false
- leaflet_gesture_handling:
- weight: 0
- enabled: false
- leaflet_rotate:
- weight: 0
- settings:
- display_control: true
- bearing: 0.0
- enabled: false
- leaflet_control_attribution:
- weight: 0
- settings:
- position: topright
- prefix: Leaflet
- enabled: false
- leaflet_control_fullscreen:
- weight: 0
- settings:
- position: topright
- enabled: false
- leaflet_control_geocoder:
- weight: 0
- settings:
- position: topright
- geocoder: google_geocoding_api
- settings:
- label: Address
- description: 'Enter an address to be localized.'
- autocomplete_min_length: 1
- component_restrictions:
- route: ''
- country: ''
- administrative_area: ''
- locality: ''
- postal_code: ''
- boundary_restriction:
- south: ''
- west: ''
- north: ''
- east: ''
- region: ''
- enabled: false
- leaflet_control_locate:
- weight: 0
- settings:
- position: topright
- enabled: false
- leaflet_control_recenter:
- weight: 0
- settings:
- position: topright
- enabled: false
- leaflet_control_scale:
- weight: 0
- settings:
- position: topright
- metric: true
- imperial: true
- enabled: false
- leaflet_control_layer:
- weight: 0
- settings:
- position: topright
- default_label: Default
- tile_layer_providers:
- OpenStreetMap:
- 'OpenStreetMap Mapnik':
- checkbox: false
- label: ''
- 'OpenStreetMap BlackAndWhite':
- checkbox: false
- label: ''
- 'OpenStreetMap DE':
- checkbox: false
- label: ''
- 'OpenStreetMap CH':
- checkbox: false
- label: ''
- 'OpenStreetMap France':
- checkbox: false
- label: ''
- 'OpenStreetMap HOT':
- checkbox: false
- label: ''
- 'OpenStreetMap BZH':
- checkbox: false
- label: ''
- OpenTopoMap:
- OpenTopoMap:
- checkbox: false
- label: ''
- Thunderforest:
- 'Thunderforest OpenCycleMap':
- checkbox: false
- label: ''
- 'Thunderforest Transport':
- checkbox: false
- label: ''
- 'Thunderforest TransportDark':
- checkbox: false
- label: ''
- 'Thunderforest SpinalMap':
- checkbox: false
- label: ''
- 'Thunderforest Landscape':
- checkbox: false
- label: ''
- 'Thunderforest Outdoors':
- checkbox: false
- label: ''
- 'Thunderforest Pioneer':
- checkbox: false
- label: ''
- OpenMapSurfer:
- 'OpenMapSurfer Roads':
- checkbox: false
- label: ''
- 'OpenMapSurfer Grayscale':
- checkbox: false
- label: ''
- Hydda:
- 'Hydda Full':
- checkbox: false
- label: ''
- 'Hydda Base':
- checkbox: false
- label: ''
- MapBox:
- MapBox:
- checkbox: false
- label: ''
- Stamen:
- 'Stamen Toner':
- checkbox: false
- label: ''
- 'Stamen TonerBackground':
- checkbox: false
- label: ''
- 'Stamen TonerLite':
- checkbox: false
- label: ''
- 'Stamen Watercolor':
- checkbox: false
- label: ''
- 'Stamen Terrain':
- checkbox: false
- label: ''
- 'Stamen TerrainBackground':
- checkbox: false
- label: ''
- 'Stamen TopOSMRelief':
- checkbox: false
- label: ''
- Esri:
- 'Esri WorldStreetMap':
- checkbox: false
- label: ''
- 'Esri DeLorme':
- checkbox: false
- label: ''
- 'Esri WorldTopoMap':
- checkbox: false
- label: ''
- 'Esri WorldImagery':
- checkbox: false
- label: ''
- 'Esri WorldTerrain':
- checkbox: false
- label: ''
- 'Esri WorldShadedRelief':
- checkbox: false
- label: ''
- 'Esri WorldPhysical':
- checkbox: false
- label: ''
- 'Esri OceanBasemap':
- checkbox: false
- label: ''
- 'Esri NatGeoWorldMap':
- checkbox: false
- label: ''
- 'Esri WorldGrayCanvas':
- checkbox: false
- label: ''
- HERE:
- 'HERE normalDay':
- checkbox: false
- label: ''
- 'HERE normalDayCustom':
- checkbox: false
- label: ''
- 'HERE normalDayGrey':
- checkbox: false
- label: ''
- 'HERE normalDayMobile':
- checkbox: false
- label: ''
- 'HERE normalDayGreyMobile':
- checkbox: false
- label: ''
- 'HERE normalDayTransit':
- checkbox: false
- label: ''
- 'HERE normalDayTransitMobile':
- checkbox: false
- label: ''
- 'HERE normalNight':
- checkbox: false
- label: ''
- 'HERE normalNightMobile':
- checkbox: false
- label: ''
- 'HERE normalNightGrey':
- checkbox: false
- label: ''
- 'HERE normalNightGreyMobile':
- checkbox: false
- label: ''
- 'HERE normalNightTransit':
- checkbox: false
- label: ''
- 'HERE normalNightTransitMobile':
- checkbox: false
- label: ''
- 'HERE redcuedDay':
- checkbox: false
- label: ''
- 'HERE redcuedNight':
- checkbox: false
- label: ''
- 'HERE basicMap':
- checkbox: false
- label: ''
- 'HERE mapLabels':
- checkbox: false
- label: ''
- 'HERE trafficFlow':
- checkbox: false
- label: ''
- 'HERE carnavDayGrey':
- checkbox: false
- label: ''
- 'HERE hybridDayMobile':
- checkbox: false
- label: ''
- 'HERE hybridDayTransit':
- checkbox: false
- label: ''
- 'HERE hybridDayGrey':
- checkbox: false
- label: ''
- 'HERE pedestrianDay':
- checkbox: false
- label: ''
- 'HERE pedestrianNight':
- checkbox: false
- label: ''
- 'HERE satelliteDay':
- checkbox: false
- label: ''
- 'HERE terrainDay':
- checkbox: false
- label: ''
- 'HERE terrainDayMobile':
- checkbox: false
- label: ''
- FreeMapSK:
- FreeMapSK:
- checkbox: false
- label: ''
- MtbMap:
- MtbMap:
- checkbox: false
- label: ''
- CartoDB:
- 'CartoDB Positron':
- checkbox: false
- label: ''
- 'CartoDB PositronNoLabels':
- checkbox: false
- label: ''
- 'CartoDB PositronOnlyLabels':
- checkbox: false
- label: ''
- 'CartoDB DarkMatter':
- checkbox: false
- label: ''
- 'CartoDB DarkMatterNoLabels':
- checkbox: false
- label: ''
- 'CartoDB DarkMatterOnlyLabels':
- checkbox: false
- label: ''
- 'CartoDB Voyager':
- checkbox: false
- label: ''
- 'CartoDB VoyagerNoLabels':
- checkbox: false
- label: ''
- 'CartoDB VoyagerOnlyLabels':
- checkbox: false
- label: ''
- 'CartoDB VoyagerLabelsUnder':
- checkbox: false
- label: ''
- HikeBike:
- HikeBike:
- checkbox: false
- label: ''
- 'HikeBike HillShading':
- checkbox: false
- label: ''
- BasemapAT:
- 'BasemapAT basemap':
- checkbox: false
- label: ''
- 'BasemapAT grau':
- checkbox: false
- label: ''
- 'BasemapAT overlay':
- checkbox: false
- label: ''
- 'BasemapAT highdpi':
- checkbox: false
- label: ''
- 'BasemapAT orthofoto':
- checkbox: false
- label: ''
- NLS:
- NLS:
- checkbox: false
- label: ''
- GeoportailFrance:
- 'GeoportailFrance parcels':
- checkbox: false
- label: ''
- 'GeoportailFrance ignMaps':
- checkbox: false
- label: ''
- 'GeoportailFrance maps':
- checkbox: false
- label: ''
- 'GeoportailFrance orthos':
- checkbox: false
- label: ''
- tile_providers_options:
- Thunderforest:
- apikey: ''
- MapBox:
- accessToken: ''
- HERE:
- app_id: ''
- app_code: ''
- GeoportailFrance:
- apikey: ''
- enabled: false
- leaflet_control_zoom:
- weight: 0
- settings:
- position: topright
- enabled: false
- leaflet_marker_clusterer:
- weight: 0
- settings:
- cluster_settings:
- show_coverage_on_hover: true
- zoom_to_bounds_on_click: true
- disable_clustering_at_zoom: 0
- custom_marker_settings: ''
- enabled: false
- leaflet_marker_icon:
- weight: 0
- settings:
- marker_shadow_path: ''
- marker_icon_path: ''
- icon_size:
- width: null
- height: null
- icon_anchor:
- x: null
- 'y': null
- popup_anchor:
- x: 0
- 'y': 0
- shadow_size:
- width: null
- height: null
- shadow_anchor:
- x: null
- 'y': null
- enabled: false
- leaflet_marker_popup:
- weight: 0
- settings:
- info_auto_display: false
- max_width: 300
- min_width: 50
- max_height: 0
- auto_pan: true
- keep_in_view: false
- close_button: true
- auto_close: true
- close_on_escape_key: true
- class_name: ''
- enabled: false
- geolocation_marker_scroll_to_id:
- weight: 0
- settings:
- scroll_target_id: ''
- enabled: false
- leaflet_marker_zoom_and_animate:
- weight: 0
- settings:
- marker_zoom_anchor_id: ''
- enabled: false
- leaflet_max_bounds:
- weight: 0
- settings:
- north: null
- south: null
- east: null
- west: null
- enabled: false
- leaflet_custom_tile_layer:
- weight: 0
- settings:
- tile_layer_url: '//{s}.tile.osm.org/{z}/{x}/{y}.png'
- tile_layer_attribution: '© OpenStreetMap contributors'
- tile_layer_subdomains: abc
- tile_layer_zoom: 18
- enabled: false
- leaflet_tile_layer_overlay:
- weight: 0
- settings:
- tile_layer_overlay: OpenInfraMap.Power
- enabled: false
- leaflet_tile_layer:
- weight: 0
- settings:
- tile_layer_provider: 'OpenStreetMap Mapnik'
- tile_provider_options:
- Thunderforest:
- apikey: ''
- MapBox:
- accessToken: ''
- HERE:
- app_id: ''
- app_code: ''
- GeoportailFrance:
- apikey: ''
- enabled: false
- leaflet_wms:
- weight: 0
- settings:
- url: ''
- version: 1.1.1
- layers: ''
- styles: ''
- srs: ''
- format: image/jpeg
- transparent: false
- identify: false
- enabled: false
- zoom: '10'
- height: 400px
- width: 100%
- minZoom: '0'
- maxZoom: '18'
- maxBounds:
- north_east_bound:
- lat: null
- lng: null
- south_west_bound:
- lat: null
- lng: null
- crs: EPSG3857
- preferCanvas: false
- zoomSnap: 1
- zoomDelta: 1
- trackResize: true
- boxZoom: true
- doubleClickZoom: true
- dragging: true
- zoomAnimation: true
- zoomAnimationThreshold: 4
- fadeAnimation: true
- markerZoomAnimation: true
- inertia: false
- inertiaDeceleration: 3000
- easeLinearity: 0.2
- worldCopyJump: false
- maxBoundsViscosity: 0.0
- keyboard: true
- keyboardPanDelta: 80
- scrollWheelZoom: true
- wheelDebounceTime: 40
- wheelPxPerZoomLevel: 60
- tap: true
- tapTolerance: 15
- touchZoom: true
- bounceAtZoomLimits: true
- data_provider_settings: { }
- third_party_settings: { }
- weight: 15
- region: content
localgov_contact_minicom:
type: telephone_link
label: inline
@@ -777,5 +189,14 @@ content:
third_party_settings: { }
weight: 7
region: content
+ localgov_location:
+ type: entity_reference_entity_view
+ label: above
+ settings:
+ view_mode: localgov_paragraph_contact
+ link: false
+ third_party_settings: { }
+ weight: 15
+ region: content
hidden:
search_api_excerpt: true
diff --git a/config/install/core.entity_view_mode.geo_entity.localgov_paragraph_contact.yml b/config/install/core.entity_view_mode.geo_entity.localgov_paragraph_contact.yml
new file mode 100644
index 0000000..368a223
--- /dev/null
+++ b/config/install/core.entity_view_mode.geo_entity.localgov_paragraph_contact.yml
@@ -0,0 +1,10 @@
+langcode: en
+status: true
+dependencies:
+ module:
+ - geo_entity
+id: geo_entity.localgov_paragraph_contact
+label: 'Contact paragraph'
+description: ''
+targetEntityType: geo_entity
+cache: true
diff --git a/config/install/field.field.paragraph.localgov_contact.localgov_contact_location.yml b/config/install/field.field.paragraph.localgov_contact.localgov_contact_location.yml
deleted file mode 100644
index 967724f..0000000
--- a/config/install/field.field.paragraph.localgov_contact.localgov_contact_location.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-langcode: en
-status: true
-dependencies:
- config:
- - field.storage.paragraph.localgov_contact_location
- - paragraphs.paragraphs_type.localgov_contact
- module:
- - geolocation
-id: paragraph.localgov_contact.localgov_contact_location
-field_name: localgov_contact_location
-entity_type: paragraph
-bundle: localgov_contact
-label: Location
-description: ''
-required: false
-translatable: false
-default_value: { }
-default_value_callback: ''
-settings: { }
-field_type: geolocation
diff --git a/config/install/field.field.paragraph.localgov_contact.localgov_location.yml b/config/install/field.field.paragraph.localgov_contact.localgov_location.yml
new file mode 100644
index 0000000..e45ebc6
--- /dev/null
+++ b/config/install/field.field.paragraph.localgov_contact.localgov_location.yml
@@ -0,0 +1,28 @@
+langcode: en
+status: true
+dependencies:
+ config:
+ - field.storage.paragraph.localgov_location
+ - geo_entity.geo_entity_type.address
+ - paragraphs.paragraphs_type.localgov_contact
+id: paragraph.localgov_contact.localgov_location
+field_name: localgov_location
+entity_type: paragraph
+bundle: localgov_contact
+label: Address
+description: ''
+required: false
+translatable: false
+default_value: { }
+default_value_callback: ''
+settings:
+ handler: 'default:geo_entity'
+ handler_settings:
+ target_bundles:
+ address: address
+ sort:
+ field: _none
+ direction: ASC
+ auto_create: false
+ auto_create_bundle: ''
+field_type: entity_reference
diff --git a/config/install/field.storage.paragraph.localgov_contact_location.yml b/config/install/field.storage.paragraph.localgov_location.yml
similarity index 57%
rename from config/install/field.storage.paragraph.localgov_contact_location.yml
rename to config/install/field.storage.paragraph.localgov_location.yml
index 45b9111..08c5c7b 100644
--- a/config/install/field.storage.paragraph.localgov_contact_location.yml
+++ b/config/install/field.storage.paragraph.localgov_location.yml
@@ -2,14 +2,15 @@ langcode: en
status: true
dependencies:
module:
- - geolocation
+ - geo_entity
- paragraphs
-id: paragraph.localgov_contact_location
-field_name: localgov_contact_location
+id: paragraph.localgov_location
+field_name: localgov_location
entity_type: paragraph
-type: geolocation
-settings: { }
-module: geolocation
+type: entity_reference
+settings:
+ target_type: geo_entity
+module: core
locked: false
cardinality: 1
translatable: true
diff --git a/localgov_paragraphs.info.yml b/localgov_paragraphs.info.yml
index d5f8b76..055b631 100644
--- a/localgov_paragraphs.info.yml
+++ b/localgov_paragraphs.info.yml
@@ -18,12 +18,10 @@ dependencies:
- entity_browser:entity_browser
- entity_usage:entity_usage
- field_group:field_group
- - geolocation:geolocation
- - geolocation:geolocation_google_maps
- - geolocation:geolocation_leaflet
- office_hours:office_hours
- paragraphs:paragraphs (>=8.x-1.13)
- paragraphs:paragraphs_library
# LocalGovDrupal
- localgov_core:localgov_media
+ - localgov_geo:localgov_geo_address
- localgov_topics:localgov_topics