diff --git a/composer.json b/composer.json index cacba619aedd6316c2af4c582a8400e43b106d6f..f2a3540407ef568561a5623c152b112dbaa86d00 100644 --- a/composer.json +++ b/composer.json @@ -152,7 +152,7 @@ "drupal/scheduler": "1.3", "drupal/search_api": "1.19", "drupal/search_api_db": "1.19", - "drupal/simple_gmap": "3.0", + "drupal/simple_gmap": "3.0.1", "drupal/simple_instagram_feed": "^3.11", "drupal/simple_sitemap": "3.10", "drupal/simplesamlphp_auth": "3.2", @@ -297,4 +297,4 @@ "php": "7.3" } } -} \ No newline at end of file +} diff --git a/composer.lock b/composer.lock index ea098a6d52e4668e34f1cdc9fc2f18fb81017f2c..fd5028266b10d5e130222de9655d2c337acc1b30 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": "5e913ecc2674d50863351c9eb0543bd0", + "content-hash": "fee4605914ce853b0fedcd63d88f7187", "packages": [ { "name": "alchemy/zippy", @@ -6630,17 +6630,17 @@ }, { "name": "drupal/simple_gmap", - "version": "3.0.0", + "version": "3.0.1", "source": { "type": "git", "url": "https://git.drupalcode.org/project/simple_gmap.git", - "reference": "3.0.0" + "reference": "3.0.1" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/simple_gmap-3.0.0.zip", - "reference": "3.0.0", - "shasum": "ad74aaec5a1eec64cc72a8d4a272564c53ee7594" + "url": "https://ftp.drupal.org/files/projects/simple_gmap-3.0.1.zip", + "reference": "3.0.1", + "shasum": "16c3d3a2f3470312e8e82d5d95cb70ba7cb54ff1" }, "require": { "drupal/core": "^8 || ^9" @@ -6651,8 +6651,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "3.0.0", - "datestamp": "1591439940", + "version": "3.0.1", + "datestamp": "1622931515", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" diff --git a/vendor/composer/InstalledVersions.php b/vendor/composer/InstalledVersions.php index 65b8bbf59b04cb421def8c8bbbe5bc2836047d70..9b98c95653a71fa6aa1235d9e645d934f5b04f58 100644 --- a/vendor/composer/InstalledVersions.php +++ b/vendor/composer/InstalledVersions.php @@ -20,8 +20,6 @@ - - class InstalledVersions { private static $installed = array ( @@ -32,7 +30,7 @@ class InstalledVersions 'aliases' => array ( ), - 'reference' => '44d42d547d363bbf388a60a73f91adfd1aced20b', + 'reference' => '693e2fb4efe9370961047d81617e21e8a1687819', 'name' => 'osu-asc-webservices/d8-upstream', ), 'versions' => @@ -1665,12 +1663,12 @@ class InstalledVersions ), 'drupal/simple_gmap' => array ( - 'pretty_version' => '3.0.0', - 'version' => '3.0.0.0', + 'pretty_version' => '3.0.1', + 'version' => '3.0.1.0', 'aliases' => array ( ), - 'reference' => '3.0.0', + 'reference' => '3.0.1', ), 'drupal/simple_instagram_feed' => array ( @@ -2228,7 +2226,7 @@ class InstalledVersions 'aliases' => array ( ), - 'reference' => '44d42d547d363bbf388a60a73f91adfd1aced20b', + 'reference' => '693e2fb4efe9370961047d81617e21e8a1687819', ), 'pantheon-systems/quicksilver-pushback' => array ( @@ -3182,6 +3180,7 @@ public static function getInstalledPackages() $packages[] = array_keys($installed['versions']); } + if (1 === \count($packages)) { return $packages[0]; } @@ -3345,11 +3344,8 @@ public static function getRootPackage() - public static function getRawData() { -@trigger_error('getRawData only returns the first dataset loaded, which may not be what you expect. Use getAllRawData() instead which returns all datasets for all autoloaders present in the process.', E_USER_DEPRECATED); - return self::$installed; } @@ -3359,17 +3355,6 @@ public static function getRawData() -public static function getAllRawData() -{ -return self::getInstalled(); -} - - - - - - - @@ -3391,7 +3376,6 @@ public static function reload($data) - private static function getInstalled() { if (null === self::$canGetVendors) { diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index 934d826f3967254e233845471483b1fa327f9ac3..a1f00726922722d41b68a6af2b2bf96140cbf5a0 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -6890,18 +6890,18 @@ }, { "name": "drupal/simple_gmap", - "version": "3.0.0", - "version_normalized": "3.0.0.0", + "version": "3.0.1", + "version_normalized": "3.0.1.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/simple_gmap.git", - "reference": "3.0.0" + "reference": "3.0.1" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/simple_gmap-3.0.0.zip", - "reference": "3.0.0", - "shasum": "ad74aaec5a1eec64cc72a8d4a272564c53ee7594" + "url": "https://ftp.drupal.org/files/projects/simple_gmap-3.0.1.zip", + "reference": "3.0.1", + "shasum": "16c3d3a2f3470312e8e82d5d95cb70ba7cb54ff1" }, "require": { "drupal/core": "^8 || ^9" @@ -6912,8 +6912,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "3.0.0", - "datestamp": "1591439940", + "version": "3.0.1", + "datestamp": "1622931515", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php index c3040560cb39199bd3e91244e0353df1e9bd05c8..bb375564b73c20189a126a2843b29079c85e358f 100644 --- a/vendor/composer/installed.php +++ b/vendor/composer/installed.php @@ -6,7 +6,7 @@ 'aliases' => array ( ), - 'reference' => '44d42d547d363bbf388a60a73f91adfd1aced20b', + 'reference' => '693e2fb4efe9370961047d81617e21e8a1687819', 'name' => 'osu-asc-webservices/d8-upstream', ), 'versions' => @@ -1639,12 +1639,12 @@ ), 'drupal/simple_gmap' => array ( - 'pretty_version' => '3.0.0', - 'version' => '3.0.0.0', + 'pretty_version' => '3.0.1', + 'version' => '3.0.1.0', 'aliases' => array ( ), - 'reference' => '3.0.0', + 'reference' => '3.0.1', ), 'drupal/simple_instagram_feed' => array ( @@ -2202,7 +2202,7 @@ 'aliases' => array ( ), - 'reference' => '44d42d547d363bbf388a60a73f91adfd1aced20b', + 'reference' => '693e2fb4efe9370961047d81617e21e8a1687819', ), 'pantheon-systems/quicksilver-pushback' => array ( diff --git a/web/modules/simple_gmap/simple_gmap.info.yml b/web/modules/simple_gmap/simple_gmap.info.yml index ea6115c80cbe5817a862ec8372b4ba987fc557e6..7680f946f1a639fe49aa16930207465e609d3533 100644 --- a/web/modules/simple_gmap/simple_gmap.info.yml +++ b/web/modules/simple_gmap/simple_gmap.info.yml @@ -10,7 +10,7 @@ dependencies: test_dependencies: - address -# Information added by Drupal.org packaging script on 2020-06-06 -version: '3.0.0' +# Information added by Drupal.org packaging script on 2021-06-05 +version: '3.0.1' project: 'simple_gmap' -datestamp: 1591439944 +datestamp: 1622931516 diff --git a/web/modules/simple_gmap/templates/simple-gmap-output.html.twig b/web/modules/simple_gmap/templates/simple-gmap-output.html.twig index 0bb551b8bb152d35b8f58c989b3c711486da33b6..535fc86eefb105a6681b4fe6931b5b073b4a956a 100644 --- a/web/modules/simple_gmap/templates/simple-gmap-output.html.twig +++ b/web/modules/simple_gmap/templates/simple-gmap-output.html.twig @@ -28,7 +28,11 @@ */ #} {% if include_map %} - <iframe width="{{ width }}" height="{{ height }}" title="{{ iframe_title }}" frameborder="0" style="border:0" src="https://maps.google.com/maps?hl={{ langcode }}&q={{ url_suffix }}&t={{ map_type }}&z={{ zoom }}&output=embed"></iframe> + {% set new_map_type = 0 %} + {% if map_type == 'k' %} + {% set new_map_type = 1 %} + {% endif %} + <iframe width="{{ width }}" height="{{ height }}" title="{{ iframe_title }}" frameborder="0" style="border:0" src="https://www.google.com/maps/embed?origin=mfe&pb=!1m4!2m1!1s{{ url_suffix }}!5e{{ new_map_type }}!6i{{ zoom }}!5m1!1s{{ langcode }}"></iframe> {% endif %} {% if include_static_map %} <div class="simple-gmap-static-map"> @@ -36,7 +40,7 @@ </div> {% endif %} {% if include_link %} - <p class="simple-gmap-link"><a href="https://maps.google.com/maps?q={{ url_suffix }}&hl={{ langcode }}&t={{ map_type }}&z={{ zoom }}" target="_blank">{{ link_text }}</a></p> + <p class="simple-gmap-link"><a href="https://www.google.com/maps?q={{ url_suffix }}&hl={{ langcode }}&t={{ map_type }}&z={{ zoom }}" target="_blank">{{ link_text }}</a></p> {% endif %} {% if address_text is not empty %} <p class="simple-gmap-address">{{ address_text }}</p> diff --git a/web/modules/simple_gmap/tests/module/simple_gmap_stress_test/simple_gmap_stress_test.info.yml b/web/modules/simple_gmap/tests/module/simple_gmap_stress_test/simple_gmap_stress_test.info.yml index 701537a01ffca5f54f51c865b6793fbcb2dcb3d0..bacf577682c7048dfb7a92dea585be33a235f78d 100644 --- a/web/modules/simple_gmap/tests/module/simple_gmap_stress_test/simple_gmap_stress_test.info.yml +++ b/web/modules/simple_gmap/tests/module/simple_gmap_stress_test/simple_gmap_stress_test.info.yml @@ -7,7 +7,7 @@ core_version_requirement: ^8 || ^9 dependencies: - simple_gmap -# Information added by Drupal.org packaging script on 2020-06-06 -version: '3.0.0' +# Information added by Drupal.org packaging script on 2021-06-05 +version: '3.0.1' project: 'simple_gmap' -datestamp: 1591439944 +datestamp: 1622931516