diff --git a/VERSIONS b/VERSIONS
index eb218ef5992bdfcf4ccbfba32d921b1554e41275..046c4c4cc58515526cc5e947b4a7e81f0f3e55ec 100644
--- a/VERSIONS
+++ b/VERSIONS
@@ -1,3 +1,13 @@
+11/10/2018 - v7.12.39
+
+ - ticket #80455 : Cosmogramme : correction d'un libellé de format de date de nouveauté
+
+ - ticket #79363 : Lieux : Abandon de l'API Google pour la géolocalisation, fourniture d'un service AFI pour génération des cartes statiques basées sur OpenStreetMap
+
+ - ticket #80427 : Résultate de recherche : n'affiche plus le bloc CVS lorsqu'on est connecté en administrateur système
+
+
+
 08/10/2018 - v7.12.38
 
  - ticket #59497 : Sélection multiple de notices pour impression, export et sauvegarde
diff --git a/application/modules/opac/views/scripts/index/planaccess.phtml b/application/modules/opac/views/scripts/index/planaccess.phtml
deleted file mode 100644
index d62458f8e95620291f6cfe5039ae8ff22683ff5f..0000000000000000000000000000000000000000
--- a/application/modules/opac/views/scripts/index/planaccess.phtml
+++ /dev/null
@@ -1,52 +0,0 @@
-<script src="<?php echo URL_JS?>plan_acces.js"> </script>
-<?php echo $this->mapEvents(); ?>
-<script
-  src="https://maps.google.com/maps?file=api&amp;v=2&amp;key=<?php echo $this->googleKey?>"
-  type="text/javascript"></script>
-
-<link rel="stylesheet"
-  type="text/css" media="screen"
-  href="<?php echo URL_ADMIN_CSS;?>map.css" />
-
-<script type="text/javascript">
-function initOCouches()
-{
-<?php echo $this->oCouches; ?>
-return oCouches;
-}
-
-function initHIcone()
-{
-<?php echo $this->hIcone; ?>
-return hIcone;
-}
-
-</script>
-<div>
-<span id="abonne_erreur" class="abonne"><?php echo $this->traduire($this->message); ?></span>
-
-<?php $this->openBoite("Plan d'accès")?>
-<table class="map">
-  <tr>
-    <td>
-    <ul class="map">
-
-    <?php for($couche=1; $couche<=count($this->map["couches"]); $couche++)
-    {
-      echo ('<a href="javascript:afficher_couche('.$couche.')"><li>'.stripslashes($this->map["couches"][$couche]["titre"]).'</li></a>');
-    } ?>
-
-    </ul>
-    </td>
-  </tr>
-
-  <tr>
-    <td>
-    <div id="map" style="width: 630px; height: 570px"></div>
-    </td>
-  </tr>
-
-</table>
-</div>
-
-<?php $this->closeBoite(); ?>
diff --git a/cosmogramme/cosmozend/tests/application/modules/cosmo/controllers/DataProfileControllerTest.php b/cosmogramme/cosmozend/tests/application/modules/cosmo/controllers/DataProfileControllerTest.php
index b386b05112b0c7c0e7e62541fcdecedf9990a085..b1c7897270f206d2c22fd7d080581d34fd1d5af3 100644
--- a/cosmogramme/cosmozend/tests/application/modules/cosmo/controllers/DataProfileControllerTest.php
+++ b/cosmogramme/cosmozend/tests/application/modules/cosmo/controllers/DataProfileControllerTest.php
@@ -256,6 +256,12 @@ class Cosmo_DataProfileControllerEditUnimarcKohaTest extends Cosmo_DataProfileCo
   }
 
 
+  /** @test */
+  public function nouveauteFormatAAAAMMJJShouldExists() {
+    $this->assertXPathContentContains('//select[@id="nouveaute_format"]/option', 'AAAAMMJJ');
+  }
+
+
   /** @test */
   public function multiInputNouveauteValeursShouldBePresent() {
     $this->assertXPath('//form//div[@id="multi_inputs_nouveaute_valeurs"]');
diff --git a/cosmogramme/sql/patch/patch_355.php b/cosmogramme/sql/patch/patch_355.php
new file mode 100644
index 0000000000000000000000000000000000000000..4ca530e9da3e4bf7bbd8a0c6830ce52b986295d6
--- /dev/null
+++ b/cosmogramme/sql/patch/patch_355.php
@@ -0,0 +1,3 @@
+<?php
+Zend_Db_Table_Abstract::getDefaultAdapter()
+  ->query('update bib_admin_var set valeur="https://smap.afi-sa.net/staticmap.php" where clef="STATIC_MAP"');
diff --git a/library/Class/AdminVar.php b/library/Class/AdminVar.php
index 5398847ea2e615bc18efdadf5ddd6d817d3b4552..4388b4bd5cc6a62317f0a105b9cc79143eef1c84 100644
--- a/library/Class/AdminVar.php
+++ b/library/Class/AdminVar.php
@@ -309,7 +309,6 @@ class Class_AdminVarLoader extends Storm_Model_Loader {
                                                                        . $this->_('De plus, à la connexion, l\'enregistrement des mots de passes des abonnés est désactivé.'))->bePrivate(),
             'OAUTH_ACCEPT_HTTP' => Class_AdminVar_Meta::newOnOff($this->_('Autoriser l\'accès aux API OAUTH via HTTP (non sécurisé - déconseillé)'), ['value' => 0]),
             'NB_AFFICH_AVIS_PAR_AUTEUR'  => Class_AdminVar_Meta::newDefault($this->_('Nombre d\'avis maximum à afficher par utilisateur.')),
-            'CLEF_GOOGLE_MAP' => Class_AdminVar_Meta::newDefault($this->_('Clef d\'activation pour le plan d\'accès google map. <a target="_blank" href="http://code.google.com/apis/maps/signup.html">Obtenir la clé google map</a>')),
             'REGISTER_OK' => Class_AdminVar_Meta::newEncodedData($this->_('Texte visible par l\'internaute après son inscription.')),
             'RESA_CONDITION' => Class_AdminVar_Meta::newEncodedData($this->_('Texte visible après l\'envoi d\'e-mail de demande de réservation.')),
             'SITE_OK' => Class_AdminVar_Meta::newOnOff($this->_('Désactiver pour passer le site en maintenance')),
@@ -449,10 +448,8 @@ class Class_AdminVarLoader extends Storm_Model_Loader {
 
 
   protected function _getStaticMapVars() {
-    return ['STATIC_MAP' => Class_AdminVar_Meta::newCombo($this->_('API utilisée pour les cartes statiques'),
-                                                          ['options' => ['selectOptions' => ['label' => $this->_('API'),
-                                                                                             'value' => Class_Map::GOOGLE_API,
-                                                                                             'multioptions' => (new Class_Map())->getAPIs()]]])->bePrivate()];
+    return ['STATIC_MAP' => Class_AdminVar_Meta::newDefault($this->_('URL utilisée pour les cartes statiques, doit être compatible avec https://github.com/dfacts/staticmaplite'),
+                                                            ['value' => 'https://smap.afi-sa.net/staticmap.php'])->bePrivate()];
   }
 
 
@@ -569,13 +566,6 @@ class Class_AdminVarLoader extends Storm_Model_Loader {
   }
 
 
-  public function getStaticMapApi() {
-    return ($api = static::get('STATIC_MAP'))
-            ? $api
-            : Class_Map::GOOGLE_API;
-  }
-
-
   /**
    * @return bool
    */
diff --git a/library/Class/IntProfilDonnees.php b/library/Class/IntProfilDonnees.php
index 1922cf6731d2b9775e232ef2d8d66bb49d5257e9..161307b1d541f20713ad2c8fe0731ebd05b9f573 100644
--- a/library/Class/IntProfilDonnees.php
+++ b/library/Class/IntProfilDonnees.php
@@ -193,7 +193,7 @@ class IntProfilDonneesLoader extends Storm_Model_Loader {
   public function getDateFormats() {
     return [Class_IntProfilDonnees::NOVELTY_DATE_FORMAT_NONE => '',
             Class_IntProfilDonnees::NOVELTY_DATE_FORMAT_AAAA_MM_JJ => 'AAAA-MM-JJ',
-            Class_IntProfilDonnees::NOVELTY_DATE_FORMAT_AAAAMMJJ => 'AAAMMJJ',
+            Class_IntProfilDonnees::NOVELTY_DATE_FORMAT_AAAAMMJJ => 'AAAAMMJJ',
             Class_IntProfilDonnees::NOVELTY_DATE_FORMAT_VALUES => $this->_('Valeur(s)'),
             Class_IntProfilDonnees::NOVELTY_DATE_FORMAT_JJ_MM_AAAA => 'JJ-MM-AAAA',
             Class_IntProfilDonnees::NOVELTY_DATE_FORMAT_SLASHED_JMAAAA => 'J/M/AAAA'];
diff --git a/library/Class/Map.php b/library/Class/Map.php
index 7aad6b65e7a7f12be49bc8d0ba1c135d77bfb77f..47395d0dbedfcf64b5f48f8b2f830786cf378706 100644
--- a/library/Class/Map.php
+++ b/library/Class/Map.php
@@ -21,46 +21,28 @@
 
 
 class Class_Map extends Class_Entity {
-  const
-    ZOOM = 15,
-    GOOGLE_API = 'maps.googleapis.com',
-    OSM_API = 'staticmap.openstreetmap.de';
-
-
-  public static function getAPIs() {
-    $apis = [static::GOOGLE_API,
-             static::OSM_API];
-    return array_combine($apis, $apis);
-  }
-
+  const ZOOM = 15;
 
   public static function newWith($location) {
-    $class = Class_AdminVar::getStaticMapApi() == static::GOOGLE_API
-      ? 'Class_Map_Google'
-      : 'Class_Map_OSM';
-
-    return (new $class())
-       ->setLocation($location);
+    return (new static())->setLocation($location);
   }
-}
-
 
 
-class Class_Map_OSM extends Class_Map {
   public function __construct() {
     $this->setLabel('osm');
   }
 
 
   public function getStaticMapUrl($params) {
-    if(!$full_adress = $this->getFullAdress())
+    if (!$full_adress = $this->getFullAdress())
       return '';
 
     $params = array_merge(['center' => $full_adress,
                            'markers' => $full_adress],
                           $params);
 
-    return sprintf('http://staticmap.openstreetmap.de/staticmap.php?%s', http_build_query($params));
+
+    return Class_AdminVar::getValueOrDefault('STATIC_MAP') . '?' . http_build_query($params);
   }
 
 
@@ -88,43 +70,3 @@ class Class_Map_OSM extends Class_Map {
     return sprintf('https://openstreetmap.org/?%s', http_build_query($params));
   }
 }
-
-
-
-class Class_Map_Google extends Class_Map {
-  public function __construct() {
-    $this->setLabel('google');
-  }
-
-
-  public function getStaticMapUrl($params) {
-    if(!$full_adress = $this->getFullAdress())
-      return '';
-
-    $params = array_merge(['sensor' => 'false',
-                           'center' => $full_adress,
-                           'markers' => $full_adress],
-                          $params);
-
-    return sprintf('https://maps.googleapis.com/maps/api/staticmap?%s', http_build_query($params));
-  }
-
-
-  public function getFullAdress() {
-    if(!$location = $this->getLocation())
-      return '';
-
-    if (($latitude = $location->getLatitude()) && ($longitude = $location->getLongitude()))
-      return $latitude . ',' . $longitude;
-
-    return implode(',', [$location->getAdresse(),
-                         $location->getCodePostal(),
-                         $location->getVille(),
-                         $location->getPays()]);
-  }
-
-
-  public function getFullMapUrl() {
-    return sprintf('https://maps.google.com/maps?%s', http_build_query(['q' => $this->getFullAdress()]));
-  }
-}
\ No newline at end of file
diff --git a/library/ZendAfi/Acl/AdminControllerRoles.php b/library/ZendAfi/Acl/AdminControllerRoles.php
index d95fe0bcf58a2b5abbede66c11c31337003532b3..1f58989f51d3c0065eef955c5f5fd9790a615d57 100644
--- a/library/ZendAfi/Acl/AdminControllerRoles.php
+++ b/library/ZendAfi/Acl/AdminControllerRoles.php
@@ -57,7 +57,6 @@ class ZendAfi_Acl_AdminControllerRoles extends Zend_Acl {
     $this->add(new Zend_Acl_Resource('modo'));
     $this->add(new Zend_Acl_Resource('nouveaute'));
     $this->add(new Zend_Acl_Resource('panier'));
-    $this->add(new Zend_Acl_Resource('planaccess'));
     $this->add(new Zend_Acl_Resource('rss'));
     $this->add(new Zend_Acl_Resource('sito'));
     $this->add(new Zend_Acl_Resource('menus'));
diff --git a/library/digital_resources/Cvs/View/Helper/Widget.php b/library/digital_resources/Cvs/View/Helper/Widget.php
index 859a0173b1b35efdc2adbbf9c543518b305eb4ca..7008a95b7a4293d2c584e17555ce0769e915d573 100644
--- a/library/digital_resources/Cvs/View/Helper/Widget.php
+++ b/library/digital_resources/Cvs/View/Helper/Widget.php
@@ -23,6 +23,10 @@
 class Cvs_View_Helper_Widget extends ZendAfi_View_Helper_BaseHelper {
   public function widget($settings, $criteria) {
     $config = Cvs_Config::getInstance();
+
+    if (!$config->isEnabled())
+      return '';
+
     if (!$config->hasRightAccess(Class_Users::getIdentity()))
       return '';
 
diff --git a/library/digital_resources/Cvs/tests/CvsTest.php b/library/digital_resources/Cvs/tests/CvsTest.php
index 5ddc1d782ea9f55883b2bf3568a03549c6e367d3..22ffc17cd190ff578983e4d4a7265a2a82e82de6 100644
--- a/library/digital_resources/Cvs/tests/CvsTest.php
+++ b/library/digital_resources/Cvs/tests/CvsTest.php
@@ -330,7 +330,6 @@ class CvsRecordsSearchCuissonTest extends CvsSearchWithResultTestCase {
 
 
 
-
 class CvsWithRecordsSearchDelpyTest extends CvsSearchWithResultTestCase {
   public function setUp() {
     parent::setUp();
@@ -407,6 +406,37 @@ class CvsRechercheControllerSimpleActionWithCvsActivatedTest extends CvsSearchWi
 
 
 
+class CvsRechercheControllerSimpleActionWithCvsDeactivatedTest extends CvsSearchWithResultTestCase {
+  public function setUp() {
+    parent::setUp();
+
+    Class_AdminVar::set('Cvs_BMKEY', '');
+
+    Class_Profil::getCurrentProfil()
+      ->setCfgModules(['recherche' =>
+                       ['resultatsimple' => ['cvs_autres_resultats' => 'Results from opac',
+                                             'cvs_resultat_titre' => 'CVS Ressources',
+                                             'cvs_nb_result' => '5',
+                                             'cvs_display_position' => '1']]]);
+
+    $this->dispatch('/recherche/simple/expressionRecherche/pomme/tri/alpha_auteur',true);
+
+  }
+
+  protected function _returnedXML() {
+    return '';
+  }
+
+
+  /** @test **/
+  public function pageShouldNotIncludeCvs() {
+    $this->assertNotXPath('//div[contains(@class,"cvs")]');
+  }
+}
+
+
+
+
 class CvsRechercheControllerSimpleActionWithCvsActivatedAndPreferencesHiddenTest extends CvsActivatedBorrowerLoggedTestCase {
 
   public function setUp() {
diff --git a/library/startup.php b/library/startup.php
index 02d278727ea3b97e33c3665360c95e06eddadbd9..7e0bdbb3dfea76fdaf098ecf3904d573de1ae555 100644
--- a/library/startup.php
+++ b/library/startup.php
@@ -81,7 +81,7 @@ class Bokeh_Engine {
 
   function setupConstants() {
     defineConstant('BOKEH_MAJOR_VERSION','7.12');
-    defineConstant('BOKEH_RELEASE_NUMBER', BOKEH_MAJOR_VERSION . '.38');
+    defineConstant('BOKEH_RELEASE_NUMBER', BOKEH_MAJOR_VERSION . '.39');
 
     defineConstant('BOKEH_REMOTE_FILES', 'http://git.afi-sa.fr/afi/opacce/');
 
diff --git a/tests/application/modules/admin/controllers/LieuControllerTest.php b/tests/application/modules/admin/controllers/LieuControllerTest.php
index eb86104220b8794b1530990ff62400ee057ce60b..638832ff8c484024858aa5d4241edf7cc20706e3 100644
--- a/tests/application/modules/admin/controllers/LieuControllerTest.php
+++ b/tests/application/modules/admin/controllers/LieuControllerTest.php
@@ -25,6 +25,7 @@ abstract class LieuControllerTestCase extends AbstractControllerTestCase {
     parent::setUp();
 
     Class_AdminVar::set('ACTIVITY', 0);
+
     $this->afi_annecy = $this->fixture('Class_Lieu',
                                        ['id' => 3,
                                         'libelle' => 'AFI Annecy',
@@ -43,12 +44,6 @@ abstract class LieuControllerTestCase extends AbstractControllerTestCase {
                                         'latitude' => '48,825853',
                                         'longitude' => '2,630163']);
   }
-
-
-  public function tearDown() {
-    Class_AdminVar::set('STATIC_MAP', Class_Map::GOOGLE_API);
-    parent::tearDown();
-  }
 }
 
 
@@ -287,12 +282,6 @@ class LieuControllerEditAnnecyTest extends LieuControllerTestCase {
   public function villeShouldContainsAnnecy() {
     $this->assertXPath('//input[@name="ville"][@value="Annecy"]');
   }
-
-
-  /** @test */
-  public function pageShouldContainsStaticGoogleImage() {
-    $this->assertXPath('//img[@src="https://maps.googleapis.com/maps/api/staticmap?sensor=false&center=11%2C+boulevard+du+fier%2C74000%2CAnnecy%2CFrance&markers=11%2C+boulevard+du+fier%2C74000%2CAnnecy%2CFrance&zoom=15&size=200x200"]');
-  }
 }
 
 
@@ -317,8 +306,8 @@ class LieuControllerEditLognesTest extends LieuControllerTestCase {
 
 
   /** @test */
-  public function pageShouldContainsStaticGoogleImage() {
-    $this->assertXPath('//img[@src="https://maps.googleapis.com/maps/api/staticmap?sensor=false&center=48%2C825853%2C2%2C630163&markers=48%2C825853%2C2%2C630163&zoom=15&size=200x200"]',
+  public function pageShouldContainsStaticImage() {
+    $this->assertXPath('//img[@src="https://smap.afi-sa.net/staticmap.php?center=48%2C825853%2C2%2C630163&markers=48%2C825853%2C2%2C630163&zoom=15&size=200x200"]',
                        $this->_response->getBody());
   }
 }
@@ -523,7 +512,6 @@ class LieuControllerUpdateCoordinatesForLocationActionTest extends LieuControlle
 class LieuControllerStaticMapOsmTest extends LieuControllerTestCase {
   public function setUp() {
     parent::setUp();
-    Class_AdminVar::set('STATIC_MAP', Class_Map::OSM_API);
     $this->afi_annecy->setLatitude('45.798789')
                      ->setLongitude('6.456123');
     $this->dispatch('/admin/lieu/edit/id/3', true);
@@ -532,7 +520,7 @@ class LieuControllerStaticMapOsmTest extends LieuControllerTestCase {
 
   /** @test */
   public function pageShouldContainsStaticOSMImage() {
-    $this->assertXPath('//img[@src="http://staticmap.openstreetmap.de/staticmap.php?center=45.798789%2C6.456123&markers=45.798789%2C6.456123&zoom=15&size=200x200"]',
+    $this->assertXPath('//img[@src="https://smap.afi-sa.net/staticmap.php?center=45.798789%2C6.456123&markers=45.798789%2C6.456123&zoom=15&size=200x200"]',
                        $this->_response->getBody());
   }
 }
\ No newline at end of file
diff --git a/tests/application/modules/opac/controllers/AbonneControllerActivitiesTest.php b/tests/application/modules/opac/controllers/AbonneControllerActivitiesTest.php
index aad574bb0c609e3de6e2d5f7938e77f1f07be8ca..752d13fd0eaaaf33fd2a8b0b4be31f93a0edc0dc 100644
--- a/tests/application/modules/opac/controllers/AbonneControllerActivitiesTest.php
+++ b/tests/application/modules/opac/controllers/AbonneControllerActivitiesTest.php
@@ -993,7 +993,7 @@ class AbonneControllerActivitiesSessionFevrierJavaTest extends AbstractAbonneCon
 
 
   /** @test */
-  function ddShouldContainsAdresseBonlieu() {
+  public function ddShouldContainsAdresseBonlieu() {
     $this->assertXPathContentContains('//dd', 'Bonlieu');
     $this->assertXPathContentContains('//dd', '1, rue Jean-Jaures');
     $this->assertXPathContentContains('//dd', '74007 Annecy');
@@ -1001,8 +1001,8 @@ class AbonneControllerActivitiesSessionFevrierJavaTest extends AbstractAbonneCon
 
 
   /** @test */
-  function ddShouldContainsGoogleMap() {
-    $this->assertXPath('//dd//img[@src="https://maps.googleapis.com/maps/api/staticmap?sensor=false&center=45.902179%2C6.128715&markers=45.902179%2C6.128715&zoom=15&size=300x300"]');
+  public function ddShouldContainsStaticMap() {
+    $this->assertXPath('//dd//img[@src="https://smap.afi-sa.net/staticmap.php?center=45.902179%2C6.128715&markers=45.902179%2C6.128715&zoom=15&size=300x300"]');
   }
 }
 
diff --git a/tests/application/modules/opac/controllers/ActivitiesControllerTest.php b/tests/application/modules/opac/controllers/ActivitiesControllerTest.php
index 7eba5cbc44c0751f8b3ada5894ce5a3d404d798b..94ce8f1958ff246dfc5620e92e5de3324f94ba90 100644
--- a/tests/application/modules/opac/controllers/ActivitiesControllerTest.php
+++ b/tests/application/modules/opac/controllers/ActivitiesControllerTest.php
@@ -103,7 +103,7 @@ class ActivitiesControllerActivitiesSessionFevrierJavaTest extends AbstractActiv
   /** @test */
   public function pageShouldContainsPopupLinkToInscrire() {
     $this->assertXPathContentContains('//a[contains(@href, "auth/popup-login/")]',
-                                      'S\'inscrire', $this->_response->getBody());
+                                      'S\'inscrire');
   }
 
 
@@ -114,7 +114,7 @@ class ActivitiesControllerActivitiesSessionFevrierJavaTest extends AbstractActiv
 
 
   /** @test */
-  function ddShouldContainsAdresseBonlieu() {
+  public function ddShouldContainsAdresseBonlieu() {
     $this->assertXPathContentContains('//dd', 'Bonlieu');
     $this->assertXPathContentContains('//dd', '1, rue Jean-Jaures');
     $this->assertXPathContentContains('//dd', '74007 Annecy');
@@ -122,8 +122,8 @@ class ActivitiesControllerActivitiesSessionFevrierJavaTest extends AbstractActiv
 
 
   /** @test */
-  function ddShouldContainsGoogleMap() {
-    $this->assertXPath('//dd//img[@src="https://maps.googleapis.com/maps/api/staticmap?sensor=false&center=45.902179%2C6.128715&markers=45.902179%2C6.128715&zoom=15&size=300x300"]');
+  public function ddShouldContainsStaticMap() {
+    $this->assertXPath('//dd//img[@src="https://smap.afi-sa.net/staticmap.php?center=45.902179%2C6.128715&markers=45.902179%2C6.128715&zoom=15&size=300x300"]');
   }
 }
 
diff --git a/tests/application/modules/opac/controllers/CmsControllerTest.php b/tests/application/modules/opac/controllers/CmsControllerTest.php
index 0ecf66622edfc2be6361ddbd0a936f3346b298ea..feef5c25d60d76932ef266a482d8d7b791b14e19 100644
--- a/tests/application/modules/opac/controllers/CmsControllerTest.php
+++ b/tests/application/modules/opac/controllers/CmsControllerTest.php
@@ -823,7 +823,9 @@ abstract class CmsControllerWithFeteDeLaFriteTestCase extends AbstractController
                              ['id' => '4156465',
                               'libelle' => 'Annecy',
                               'adresse' => 'Rue des tomates',
-                              'code_postal' => '74000']);
+                              'code_postal' => '74000',
+                              'latitude' => '45.9262592',
+                              'longitude' => '6.1459837']);
 
     $alimentaire = $this->fixture ( 'Class_ArticleCategorie', ['id' => 1,
                                                                'libelle' => 'Alimentaire',
@@ -1148,7 +1150,7 @@ class CmsControllerArticleViewTest extends CmsControllerWithFeteDeLaFriteTestCas
 
 
   /** @test */
-  function withCurrentLocaleEnShouldReturnEnglishTranslation() {
+  public function withCurrentLocaleEnShouldReturnEnglishTranslation() {
     $this->bootstrap();
     Zend_Registry::get('session')->language = 'en';
     $this->dispatch('/cms/articleview/id/224');
@@ -1163,14 +1165,14 @@ class CmsControllerArticleViewTest extends CmsControllerWithFeteDeLaFriteTestCas
 
 
   /** @test */
-  function divShouldContainsAdresseBonlieu() {
+  public function divShouldContainsAdresseBonlieu() {
     $this->assertXPathContentContains('//div[@class="lieu"]', 'Annecy');
   }
 
 
   /** @test */
-  function divShouldContainsGoogleMap() {
-    $this->assertXPath('//div[@class="lieu"]//img[contains(@src,"https://maps.googleapis.com/maps")]');
+  public function divShouldContainsStaticMap() {
+    $this->assertXPath('//div[@class="lieu"]//img[contains(@src,"https://smap.afi-sa.net/staticmap.php")]');
   }
 
 
diff --git a/tests/db/UpgradeDBTest.php b/tests/db/UpgradeDBTest.php
index 7b3871eb6b5e11fa0a72222972dec5a1a7432228..65895b80de7aa3e1a0267926fa654275ab942cfd 100644
--- a/tests/db/UpgradeDBTest.php
+++ b/tests/db/UpgradeDBTest.php
@@ -2253,4 +2253,21 @@ class UpgradeDB_354_Test extends UpgradeDBTestCase {
   public function codifEmplacementLibelleShouldBeMigratedToVarchar255() {
     $this->assertFieldType('codif_emplacement', 'libelle', 'varchar(255)');
   }
-}
\ No newline at end of file
+}
+
+
+
+
+class UpgradeDB_355_Test extends UpgradeDBTestCase {
+  public function prepare() {
+    $this->silentQuery('update bib_admin_var set valeur="static.openstreetmap.de" where clef="STATIC_MAP"');
+  }
+
+
+  /** @test */
+  public function staticMapShouldDefaultToAfiServer() {
+    $datas = $this->query('select valeur from bib_admin_var where clef="STATIC_MAP"')->fetch();
+    $this->assertEquals('https://smap.afi-sa.net/staticmap.php',
+                        $datas['valeur']);
+  }
+}