diff --git a/.gitattributes b/.gitattributes
index eb0c42ee087e11bbbd6c84cba525239bcab5a0b5..1fbc40e3180b02810a01a0e88a6e43815c98a704 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -352,7 +352,6 @@ javascript/tooltip.js -text
 json/gis_articles.html -text
 json/gis_auteurs.html -text
 json/gis_documents.html -text
-json/gis_evenements.html -text
 json/gis_mots.html -text
 json/gis_rubriques.html -text
 json/gis_sites.html -text
diff --git a/json/gis_articles.html b/json/gis_articles.html
index fc34afe17ef550efd5ccb53cdb5b8e921fe04220..50268681390018606624d9ec2f3209e951055f58 100644
--- a/json/gis_articles.html
+++ b/json/gis_articles.html
@@ -3,19 +3,7 @@
 		"geometry": {"type": "Point", "coordinates": [#LON, #LAT]},
 		"id":"#ID_GIS",
 		"properties": {
-		"title":[(#URL_ARTICLE|lien_ou_expose{[(#TITRE_GIS*|sinon{#TITRE*}|supprimer_numero)]}|json_encode)],
-		"description":[(#DESCRIPTIF_GIS|sinon{#DESCRIPTIF}|json_encode)][(#SET{logo_doc,''})]
-		[(#LOGO_GIS|oui)
-		[(#SET{logo_doc,#LOGO_GIS|image_passe_partout{32,32}|image_recadre{32,32}})]]
-		[(#LOGO_GIS|non)
-		[(#CHEMIN{images/marker_defaut.png}|oui)
-			[(#SET{logo_doc,#CHEMIN{images/marker_defaut.png}|image_passe_partout{32,32}|image_recadre{32,32}})]
-		]]
-		[(#GET{logo_doc}|oui)
-		#SET{icon_w,#GET{logo_doc}|extraire_attribut{src}|largeur}
-		#SET{icon_h,#GET{logo_doc}|extraire_attribut{src}|hauteur}
-		#SET{icon_anchorPoint,''}
-		[,"icon": (#GET{logo_doc}|extraire_attribut{src}|url_absolue|json_encode)],
-		"icon_size": [(#VAL{91}|chr)]#GET{icon_w},#GET{icon_h}[(#VAL{93}|chr)],
-		"icon_anchor": [(#VAL{91}|chr)][(#GET{icon_w}|div{2})],[(#GET{icon_h})][(#VAL{93}|chr)]
-		]}}</BOUCLE_art>
\ No newline at end of file
+			"title":[(#URL_ARTICLE|lien_ou_expose{[(#TITRE_GIS*|sinon{#TITRE*}|extraire_multi|supprimer_numero)]}|json_encode)],
+			"description":[(#DESCRIPTIF_GIS|sinon{#DESCRIPTIF}|json_encode)][
+			(#LOGO_GIS|gis_icon_properties)]
+		}}</BOUCLE_art>
\ No newline at end of file
diff --git a/json/gis_auteurs.html b/json/gis_auteurs.html
index e8efb49726d7c5234618fec18835724018617ef8..8c0d591d944e0cff5b59f071945cafdca878e709 100644
--- a/json/gis_auteurs.html
+++ b/json/gis_auteurs.html
@@ -3,23 +3,7 @@
 		"geometry": {"type": "Point", "coordinates": [#LON, #LAT]},
 		"id":"#ID_GIS",
 		"properties": {
-		"title":[(#URL_AUTEUR|lien_ou_expose{[(#TITRE_GIS*|sinon{#NOM*}|supprimer_numero)]}|json_encode)],
-		"description":[(#DESCRIPTIF_GIS|sinon{#BIO}|json_encode)][(#SET{logo_doc,''})]
-		[(#LOGO_GIS|oui)
-			[(#SET{logo_doc,#LOGO_GIS|image_passe_partout{32,32}|image_recadre{32,32}})]]
-		[(#LOGO_GIS|non)
-			[(#LOGO_AUTEUR|oui)
-				[(#SET{logo_doc,#LOGO_AUTEUR|image_passe_partout{32,32}|image_recadre{32,32}})]]
-		]
-		[(#LOGO_GIS|non)[(#LOGO_AUTEUR|non)
-		[(#CHEMIN{images/marker_defaut.png}|oui)
-			[(#SET{logo_doc,#CHEMIN{images/marker_defaut.png}|image_passe_partout{32,32}|image_recadre{32,32}})]
-		]]]
-		[(#GET{logo_doc}|oui)
-		#SET{icon_w,#GET{logo_doc}|extraire_attribut{src}|largeur}
-		#SET{icon_h,#GET{logo_doc}|extraire_attribut{src}|hauteur}
-		#SET{icon_anchorPoint,''}
-		[,"icon": (#GET{logo_doc}|extraire_attribut{src}|url_absolue|json_encode)],
-		"icon_size": [(#VAL{91}|chr)]#GET{icon_w},#GET{icon_h}[(#VAL{93}|chr)],
-		"icon_anchor": [(#VAL{91}|chr)][(#GET{icon_w}|div{2})],[(#GET{icon_h})][(#VAL{93}|chr)]
-		]}}</BOUCLE_auteurs>
\ No newline at end of file
+			"title":[(#URL_AUTEUR|lien_ou_expose{[(#TITRE_GIS*|sinon{#NOM*}|extraire_multi|supprimer_numero)]}|json_encode)],
+			"description":[(#DESCRIPTIF_GIS|sinon{#BIO}|json_encode)][
+			(#LOGO_GIS|sinon{#LOGO_AUTEUR_NORMAL}|gis_icon_properties)]
+		}}</BOUCLE_auteurs>
\ No newline at end of file
diff --git a/json/gis_documents.html b/json/gis_documents.html
index c968ca00584e6545958df8e02139c3b2e11c20c5..6019e13fd6c43f29f809a921ad2a1607021be55a 100644
--- a/json/gis_documents.html
+++ b/json/gis_documents.html
@@ -3,23 +3,7 @@
 		"geometry": {"type": "Point", "coordinates": [#LON, #LAT]},
 		"id":"#ID_GIS",
 		"properties": {
-		"title":[(#URL_DOCUMENT|lien_ou_expose{[(#TITRE_GIS*|sinon{#TITRE*}|supprimer_numero)]}|json_encode)],
-		"description":[(#DESCRIPTIF_GIS|sinon{#DESCRIPTIF}|json_encode)][(#SET{logo_doc,''})]
-		[(#LOGO_GIS|oui)
-		[(#SET{logo_doc,#LOGO_GIS|image_passe_partout{32,32}|image_recadre{32,32}})]]
-		[(#LOGO_GIS|non)
-			[(#LOGO_DOCUMENT|oui)
-				[(#SET{logo_doc,#LOGO_DOCUMENT|image_passe_partout{32,32}|image_recadre{32,32}})]]
-		]
-		[(#LOGO_GIS|non)[(#LOGO_DOCUMENT|non)
-		[(#CHEMIN{images/marker_defaut.png}|oui)
-			[(#SET{logo_doc,#CHEMIN{images/marker_defaut.png}|image_passe_partout{32,32}|image_recadre{32,32}})]
-		]]]
-		[(#GET{logo_doc}|oui)
-		#SET{icon_w,#GET{logo_doc}|extraire_attribut{src}|largeur}
-		#SET{icon_h,#GET{logo_doc}|extraire_attribut{src}|hauteur}
-		#SET{icon_anchorPoint,''}
-		[,"icon": (#GET{logo_doc}|extraire_attribut{src}|url_absolue|json_encode)],
-		"icon_size": [(#VAL{91}|chr)]#GET{icon_w},#GET{icon_h}[(#VAL{93}|chr)],
-		"icon_anchor": [(#VAL{91}|chr)][(#GET{icon_w}|div{2})],[(#GET{icon_h})][(#VAL{93}|chr)]
-		]}}</BOUCLE_doc>
\ No newline at end of file
+			"title":[(#URL_DOCUMENT|lien_ou_expose{[(#TITRE_GIS*|sinon{#TITRE*}|extraire_multi|supprimer_numero)]}|json_encode)],
+			"description":[(#DESCRIPTIF_GIS|sinon{#DESCRIPTIF}|json_encode)][
+			(#LOGO_GIS|sinon{#LOGO_DOCUMENT}|gis_icon_properties)]
+		}}</BOUCLE_doc>
\ No newline at end of file
diff --git a/json/gis_evenements.html b/json/gis_evenements.html
deleted file mode 100644
index 8408c765e696855c21d492b32eb7910a6d6e2a5d..0000000000000000000000000000000000000000
--- a/json/gis_evenements.html
+++ /dev/null
@@ -1,21 +0,0 @@
-		<BOUCLE_events(EVENEMENTS){gis}{id_evenement ?}{id_article ?}{id_rubrique ?}{id_secteur ?}{id_mot ?}{id_auteur ?}{recherche ?}{0, #ENV{limit}}{","}>
-		{"type": "Feature",
-		"geometry": {"type": "Point", "coordinates": [#LON, #LAT]},
-		"id":"#ID_GIS",
-		"properties": {
-		"title":[(#TITRE_GIS*|sinon{#TITRE*}|supprimer_numero|json_encode)],
-		"description":[(#DESCRIPTIF_GIS|sinon{#DESCRIPTIF}|json_encode)][(#SET{logo_doc,''})]
-		[(#LOGO_GIS|oui)
-		[(#SET{logo_doc,#LOGO_GIS|image_passe_partout{32,32}|image_recadre{32,32}})]]
-		[(#LOGO_GIS|non)
-		[(#CHEMIN{images/marker_defaut.png}|oui)
-			[(#SET{logo_doc,#CHEMIN{images/marker_defaut.png}|image_passe_partout{32,32}|image_recadre{32,32}})]
-		]]
-		[(#GET{logo_doc}|oui)
-		#SET{icon_w,#GET{logo_doc}|extraire_attribut{src}|largeur}
-		#SET{icon_h,#GET{logo_doc}|extraire_attribut{src}|hauteur}
-		#SET{icon_anchorPoint,''}
-		[,"icon": (#GET{logo_doc}|extraire_attribut{src}|url_absolue|json_encode)],
-		"icon_size": [(#VAL{91}|chr)]#GET{icon_w},#GET{icon_h}[(#VAL{93}|chr)],
-		"icon_anchor": [(#VAL{91}|chr)][(#GET{icon_w}|div{2})],[(#GET{icon_h})][(#VAL{93}|chr)]
-		]}}</BOUCLE_events>
diff --git a/json/gis_mots.html b/json/gis_mots.html
index 3b5b53346923e96188bb3fb22edb4c049d0d31fb..8530452ef7cbc0255c0f175a36781147017d8512 100644
--- a/json/gis_mots.html
+++ b/json/gis_mots.html
@@ -3,19 +3,7 @@
 		"geometry": {"type": "Point", "coordinates": [#LON, #LAT]},
 		"id":"#ID_GIS",
 		"properties": {
-		"title":[(#URL_MOT|lien_ou_expose{[(#TITRE_GIS*|sinon{#TITRE*}|supprimer_numero)]}|json_encode)],
-		"description":[(#DESCRIPTIF_GIS|sinon{#DESCRIPTIF}|json_encode)][(#SET{logo_doc,''})]
-		[(#LOGO_GIS|oui)
-		[(#SET{logo_doc,#LOGO_GIS|image_passe_partout{32,32}|image_recadre{32,32}})]]
-		[(#LOGO_GIS|non)
-		[(#CHEMIN{images/marker_defaut.png}|oui)
-			[(#SET{logo_doc,#CHEMIN{images/marker_defaut.png}|image_passe_partout{32,32}|image_recadre{32,32}})]
-		]]
-		[(#GET{logo_doc}|oui)
-		#SET{icon_w,#GET{logo_doc}|extraire_attribut{src}|largeur}
-		#SET{icon_h,#GET{logo_doc}|extraire_attribut{src}|hauteur}
-		#SET{icon_anchorPoint,''}
-		[,"icon": (#GET{logo_doc}|extraire_attribut{src}|url_absolue|json_encode)],
-		"icon_size": [(#VAL{91}|chr)]#GET{icon_w},#GET{icon_h}[(#VAL{93}|chr)],
-		"icon_anchor": [(#VAL{91}|chr)][(#GET{icon_w}|div{2})],[(#GET{icon_h})][(#VAL{93}|chr)]
-		]}}</BOUCLE_mots>
\ No newline at end of file
+			"title":[(#URL_MOT|lien_ou_expose{[(#TITRE_GIS*|sinon{#TITRE*}|extraire_multi|supprimer_numero)]}|json_encode)],
+			"description":[(#DESCRIPTIF_GIS|sinon{#DESCRIPTIF}|json_encode)][
+			(#LOGO_GIS|gis_icon_properties)]
+		}}</BOUCLE_mots>
\ No newline at end of file
diff --git a/json/gis_rubriques.html b/json/gis_rubriques.html
index a19fa58819614492e91dd9af7539b81a1ed2c019..192b4d5318b25419991d7f90187989832b0331ca 100644
--- a/json/gis_rubriques.html
+++ b/json/gis_rubriques.html
@@ -3,19 +3,7 @@
 		"geometry": {"type": "Point", "coordinates": [#LON, #LAT]},
 		"id":"#ID_GIS",
 		"properties": {
-		"title":[(#URL_RUBRIQUE|lien_ou_expose{[(#TITRE_GIS*|sinon{#TITRE*}|supprimer_numero)]}|json_encode)],
-		"description":[(#DESCRIPTIF_GIS|sinon{#DESCRIPTIF}|json_encode)][(#SET{logo_doc,''})]
-		[(#LOGO_GIS|oui)
-		[(#SET{logo_doc,#LOGO_GIS|image_passe_partout{32,32}|image_recadre{32,32}})]]
-		[(#LOGO_GIS|non)
-		[(#CHEMIN{images/marker_defaut.png}|oui)
-			[(#SET{logo_doc,#CHEMIN{images/marker_defaut.png}|image_passe_partout{32,32}|image_recadre{32,32}})]
-		]]
-		[(#GET{logo_doc}|oui)
-		#SET{icon_w,#GET{logo_doc}|extraire_attribut{src}|largeur}
-		#SET{icon_h,#GET{logo_doc}|extraire_attribut{src}|hauteur}
-		#SET{icon_anchorPoint,''}
-		[,"icon": (#GET{logo_doc}|extraire_attribut{src}|url_absolue|json_encode)],
-		"icon_size": [(#VAL{91}|chr)]#GET{icon_w},#GET{icon_h}[(#VAL{93}|chr)],
-		"icon_anchor": [(#VAL{91}|chr)][(#GET{icon_w}|div{2})],[(#GET{icon_h})][(#VAL{93}|chr)]
-		]}}</BOUCLE_rub>
\ No newline at end of file
+			"title":[(#URL_RUBRIQUE|extraire_multi|lien_ou_expose{[(#TITRE_GIS*|sinon{#TITRE*}|supprimer_numero)]}|json_encode)],
+			"description":[(#DESCRIPTIF_GIS|sinon{#DESCRIPTIF}|json_encode)][
+			(#LOGO_GIS|gis_icon_properties)]
+		}}</BOUCLE_rub>
\ No newline at end of file
diff --git a/json/gis_sites.html b/json/gis_sites.html
index ad71acd2d738da81b7672a3f52aefc73686a4123..9b6de8fff680e3806d284c5fd6d0221f6c02cf66 100644
--- a/json/gis_sites.html
+++ b/json/gis_sites.html
@@ -3,19 +3,7 @@
 		"geometry": {"type": "Point", "coordinates": [#LON, #LAT]},
 		"id":"#ID_GIS",
 		"properties": {
-		"title":[(#ID_SYNDIC|generer_url_entite{site}|lien_ou_expose{[(#TITRE_GIS*|sinon{#NOM_SITE*}|supprimer_numero)]}|json_encode)],
-		"description":[(#DESCRIPTIF_GIS|sinon{#DESCRIPTIF}|json_encode)][(#SET{logo_doc,''})]
-		[(#LOGO_GIS|oui)
-		[(#SET{logo_doc,#LOGO_GIS|image_passe_partout{32,32}|image_recadre{32,32}})]]
-		[(#LOGO_GIS|non)
-		[(#CHEMIN{images/marker_defaut.png}|oui)
-			[(#SET{logo_doc,#CHEMIN{images/marker_defaut.png}|image_passe_partout{32,32}|image_recadre{32,32}})]
-		]]
-		[(#GET{logo_doc}|oui)
-		#SET{icon_w,#GET{logo_doc}|extraire_attribut{src}|largeur}
-		#SET{icon_h,#GET{logo_doc}|extraire_attribut{src}|hauteur}
-		#SET{icon_anchorPoint,''}
-		[,"icon": (#GET{logo_doc}|extraire_attribut{src}|url_absolue|json_encode)],
-		"icon_size": [(#VAL{91}|chr)]#GET{icon_w},#GET{icon_h}[(#VAL{93}|chr)],
-		"icon_anchor": [(#VAL{91}|chr)][(#GET{icon_w}|div{2})],[(#GET{icon_h})][(#VAL{93}|chr)]
-		]}}</BOUCLE_sit>
\ No newline at end of file
+			"title":[(#ID_SYNDIC|generer_url_entite{site}|lien_ou_expose{[(#TITRE_GIS*|sinon{#NOM_SITE*}|extraire_multi|supprimer_numero)]}|json_encode)],
+			"description":[(#DESCRIPTIF_GIS|sinon{#DESCRIPTIF}|json_encode)][
+			(#LOGO_GIS|gis_icon_properties)]
+		}}</BOUCLE_sit>
\ No newline at end of file