diff --git a/streetup/assets/locale/en/LC_MESSAGES/django.mo b/streetup/assets/locale/en/LC_MESSAGES/django.mo
index 18256ff..42ad45c 100644
Binary files a/streetup/assets/locale/en/LC_MESSAGES/django.mo and b/streetup/assets/locale/en/LC_MESSAGES/django.mo differ
diff --git a/streetup/assets/locale/en/LC_MESSAGES/django.po b/streetup/assets/locale/en/LC_MESSAGES/django.po
index c9024b4..d039dc4 100644
--- a/streetup/assets/locale/en/LC_MESSAGES/django.po
+++ b/streetup/assets/locale/en/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-07-27 10:06+0200\n"
+"POT-Creation-Date: 2026-07-27 10:11+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -180,112 +180,112 @@ msgid "Emprise cartographique"
 msgstr "Map footprint"
 
 #: streetup/assets/models/buildings.py:96
-#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:63
+#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:71
 msgid "Adresse complète"
 msgstr "Full address"
 
 #: streetup/assets/models/buildings.py:97
-#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:68
+#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:76
 #: streetup/assets/templates/assets/components/asset_model_card.html:38
 msgid "Description"
 msgstr "Description"
 
 #: streetup/assets/models/buildings.py:100
 #: streetup/assets/templates/assets/buildings/publicbuilding_detail.html:104
-#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:84
+#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:92
 #: streetup/assets/templates/assets/buildings/publicbuilding_list.html:99
 msgid "Propriétaire"
 msgstr "Owner"
 
 #: streetup/assets/models/buildings.py:101
 #: streetup/assets/templates/assets/buildings/publicbuilding_detail.html:108
-#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:89
+#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:97
 msgid "Gestionnaire référent"
 msgstr "Referent manager"
 
 #: streetup/assets/models/buildings.py:102
-#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:94
+#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:102
 msgid "Direction / Service occupant"
 msgstr "Department / Occupant service"
 
 #: streetup/assets/models/buildings.py:105
-#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:110
+#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:118
 msgid "Type d'usage principal"
 msgstr "Main usage type"
 
 #: streetup/assets/models/buildings.py:106
-#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:115
+#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:123
 msgid "Statut d'occupation"
 msgstr "Occupancy status"
 
 #: streetup/assets/models/buildings.py:109
 #: streetup/assets/templates/assets/buildings/publicbuilding_detail.html:125
-#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:120
+#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:128
 msgid "Année de construction"
 msgstr "Construction year"
 
 #: streetup/assets/models/buildings.py:110
-#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:125
+#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:133
 msgid "Nombre d'étages hors-sol"
 msgstr "Number of above-ground floors"
 
 #: streetup/assets/models/buildings.py:111
-#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:130
+#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:138
 msgid "Nombre de niveaux en sous-sol"
 msgstr "Number of basement levels"
 
 #: streetup/assets/models/buildings.py:112
-#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:135
+#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:143
 msgid "Surface brute totale (m²)"
 msgstr "Total gross area (m²)"
 
 #: streetup/assets/models/buildings.py:113
-#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:140
+#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:148
 msgid "Surface utile (m²)"
 msgstr "Usable area (m²)"
 
 #: streetup/assets/models/buildings.py:116
-#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:151
+#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:159
 msgid "Accueil & Sécurité du Public (ERP / PMR)"
 msgstr "Public Reception & Safety (ERP / PRM)"
 
 #: streetup/assets/models/buildings.py:117
-#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:172
+#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:180
 msgid "Catégorie d'accueil / ERP"
 msgstr "Reception Category / ERP"
 
 #: streetup/assets/models/buildings.py:118
-#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:177
+#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:185
 msgid "Type d'établissement / ERP"
 msgstr "Establishment Type / ERP"
 
 #: streetup/assets/models/buildings.py:119
-#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:182
+#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:190
 msgid "Jauge maximale d'accueil du public"
 msgstr "Maximum public capacity"
 
 #: streetup/assets/models/buildings.py:122
-#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:198
+#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:206
 msgid "Performance Énergétique (PEB / DPE / EPC)"
 msgstr "Energy Performance (PEB / DPE / EPC)"
 
 #: streetup/assets/models/buildings.py:123
-#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:203
+#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:211
 msgid "Émissions de Carbone & GES"
 msgstr "Carbon & GHG Emissions"
 
 #: streetup/assets/models/buildings.py:124
-#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:211
+#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:219
 msgid "Diagnostic Amiante réalisé"
 msgstr "Asbestos Inspection completed"
 
 #: streetup/assets/models/buildings.py:125
-#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:219
+#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:227
 msgid "Diagnostic Plomb réalisé"
 msgstr "Lead Inspection completed"
 
 #: streetup/assets/models/buildings.py:126
-#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:167
+#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:175
 msgid "Accessible PMR"
 msgstr "PRM Accessible"
 
@@ -296,7 +296,7 @@ msgstr "Public building"
 
 #: streetup/assets/models/buildings.py:130
 #: streetup/assets/templates/assets/buildings/publicbuilding_detail.html:18
-#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:13
+#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:21
 #: streetup/assets/templates/assets/buildings/publicbuilding_list.html:4
 #: streetup/assets/views/core.py:782
 msgid "Bâtiments publics"
@@ -1038,12 +1038,12 @@ msgid "Code"
 msgstr "Code"
 
 #: streetup/assets/models/history.py:326
-#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:53
+#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:61
 msgid "Nom (FR)"
 msgstr "Name (FR)"
 
 #: streetup/assets/models/history.py:327
-#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:58
+#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:66
 msgid "Nom (NL)"
 msgstr "Name (NL)"
 
@@ -1194,14 +1194,14 @@ msgid "Structure"
 msgstr "Structure"
 
 #: streetup/assets/models/history.py:342
-#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:240
+#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:252
 #: streetup/assets/templates/assets/detail_generic.html:672
 #: streetup/assets/views/export.py:109
 msgid "Longitude"
 msgstr "Longitude"
 
 #: streetup/assets/models/history.py:343
-#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:235
+#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:247
 #: streetup/assets/templates/assets/detail_generic.html:683
 #: streetup/assets/views/export.py:110
 msgid "Latitude"
@@ -2657,8 +2657,8 @@ msgid "Choisissez le format d'export :"
 msgstr "Choose export format:"
 
 #: streetup/assets/templates/assets/base_assets_index.html:320
-#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:24
-#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:251
+#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:32
+#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:263
 #: streetup/assets/templates/assets/components/add_asset_modal.html:138
 #: streetup/assets/templates/assets/components/asset_documents.html:87
 #: streetup/assets/templates/assets/components/asset_location_link.html:75
@@ -2690,7 +2690,7 @@ msgid "Annuler"
 msgstr "Cancel"
 
 #: streetup/assets/templates/assets/buildings/publicbuilding_detail.html:25
-#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:15
+#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:23
 #: streetup/assets/templates/assets/permissions/panel.html:69
 #: streetup/assets/templates/assets/permissions/panel.html:111
 #: streetup/assets/templates/assets/permissions/panel.html:211
@@ -2897,48 +2897,57 @@ msgid "Aucune intervention enregistrée pour ce bâtiment."
 msgstr "No intervention registered for this building."
 
 #: streetup/assets/templates/assets/buildings/publicbuilding_form.html:4
-#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:19
+#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:27
 msgid "Modifier le bâtiment"
 msgstr "Edit building"
 
-#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:35
+#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:43
 msgid "Certains champs contiennent des erreurs."
 msgstr "Some fields contain errors."
 
-#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:35
+#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:43
 msgid "Veuillez vérifier les informations ci-dessous."
 msgstr "Please check the information below."
 
-#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:43
+#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:51
 #: streetup/assets/templates/assets/detail_generic.html:204
 msgid "Informations générales"
 msgstr "General information"
 
-#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:48
+#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:56
 msgid "Code du bâtiment"
 msgstr "Building code"
 
-#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:79
+#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:87
 msgid "Propriété & Gestion"
 msgstr "Ownership & Management"
 
-#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:105
+#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:113
 msgid "Usage & Caractéristiques physiques"
 msgstr "Usage & Physical Characteristics"
 
-#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:159
+#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:167
 msgid "Bâtiment recevant du public (ERP / PMR)"
 msgstr "Public reception building (ERP / PRM)"
 
-#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:193
+#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:201
 msgid "Diagnostics & Énergie"
 msgstr "Diagnostics & Energy"
 
-#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:230
+#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:238
 msgid "Coordonnées géographiques (GPS WGS84)"
 msgstr "Geographic Coordinates (GPS WGS84)"
 
-#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:254
+#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:242
+msgid ""
+"Cliquez sur la carte ou déplacez le marqueur pour ajuster la position du "
+"bâtiment. Vous pouvez également rechercher une adresse ou basculer en vue "
+"orthophoto."
+msgstr ""
+"Click on the map or drag the marker to adjust the building position. You "
+"can also search for an address or switch to orthophoto view."
+
+#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:266
 msgid "Enregistrer les modifications"
 msgstr "Save changes"
 
diff --git a/streetup/assets/locale/fr/LC_MESSAGES/django.po b/streetup/assets/locale/fr/LC_MESSAGES/django.po
index 24f3c18..68995f8 100644
--- a/streetup/assets/locale/fr/LC_MESSAGES/django.po
+++ b/streetup/assets/locale/fr/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-07-27 10:06+0200\n"
+"POT-Creation-Date: 2026-07-27 10:11+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -179,112 +179,112 @@ msgid "Emprise cartographique"
 msgstr ""
 
 #: streetup/assets/models/buildings.py:96
-#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:63
+#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:71
 msgid "Adresse complète"
 msgstr "À compléter"
 
 #: streetup/assets/models/buildings.py:97
-#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:68
+#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:76
 #: streetup/assets/templates/assets/components/asset_model_card.html:38
 msgid "Description"
 msgstr "Description"
 
 #: streetup/assets/models/buildings.py:100
 #: streetup/assets/templates/assets/buildings/publicbuilding_detail.html:104
-#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:84
+#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:92
 #: streetup/assets/templates/assets/buildings/publicbuilding_list.html:99
 msgid "Propriétaire"
 msgstr "Propreté"
 
 #: streetup/assets/models/buildings.py:101
 #: streetup/assets/templates/assets/buildings/publicbuilding_detail.html:108
-#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:89
+#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:97
 msgid "Gestionnaire référent"
 msgstr ""
 
 #: streetup/assets/models/buildings.py:102
-#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:94
+#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:102
 msgid "Direction / Service occupant"
 msgstr ""
 
 #: streetup/assets/models/buildings.py:105
-#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:110
+#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:118
 msgid "Type d'usage principal"
 msgstr "Type d'asset inconnu"
 
 #: streetup/assets/models/buildings.py:106
-#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:115
+#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:123
 msgid "Statut d'occupation"
 msgstr "Statut de validation"
 
 #: streetup/assets/models/buildings.py:109
 #: streetup/assets/templates/assets/buildings/publicbuilding_detail.html:125
-#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:120
+#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:128
 msgid "Année de construction"
 msgstr "Numéro de contrat"
 
 #: streetup/assets/models/buildings.py:110
-#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:125
+#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:133
 msgid "Nombre d'étages hors-sol"
 msgstr "Nombre de brins"
 
 #: streetup/assets/models/buildings.py:111
-#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:130
+#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:138
 msgid "Nombre de niveaux en sous-sol"
 msgstr ""
 
 #: streetup/assets/models/buildings.py:112
-#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:135
+#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:143
 msgid "Surface brute totale (m²)"
 msgstr "Surface (m²)"
 
 #: streetup/assets/models/buildings.py:113
-#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:140
+#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:148
 msgid "Surface utile (m²)"
 msgstr "Surface (m²)"
 
 #: streetup/assets/models/buildings.py:116
-#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:151
+#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:159
 msgid "Accueil & Sécurité du Public (ERP / PMR)"
 msgstr ""
 
 #: streetup/assets/models/buildings.py:117
-#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:172
+#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:180
 msgid "Catégorie d'accueil / ERP"
 msgstr ""
 
 #: streetup/assets/models/buildings.py:118
-#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:177
+#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:185
 msgid "Type d'établissement / ERP"
 msgstr "Type d'élément"
 
 #: streetup/assets/models/buildings.py:119
-#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:182
+#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:190
 msgid "Jauge maximale d'accueil du public"
 msgstr ""
 
 #: streetup/assets/models/buildings.py:122
-#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:198
+#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:206
 msgid "Performance Énergétique (PEB / DPE / EPC)"
 msgstr ""
 
 #: streetup/assets/models/buildings.py:123
-#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:203
+#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:211
 msgid "Émissions de Carbone & GES"
 msgstr ""
 
 #: streetup/assets/models/buildings.py:124
-#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:211
+#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:219
 msgid "Diagnostic Amiante réalisé"
 msgstr ""
 
 #: streetup/assets/models/buildings.py:125
-#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:219
+#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:227
 msgid "Diagnostic Plomb réalisé"
 msgstr ""
 
 #: streetup/assets/models/buildings.py:126
-#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:167
+#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:175
 msgid "Accessible PMR"
 msgstr "Accessoire"
 
@@ -295,7 +295,7 @@ msgstr ""
 
 #: streetup/assets/models/buildings.py:130
 #: streetup/assets/templates/assets/buildings/publicbuilding_detail.html:18
-#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:13
+#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:21
 #: streetup/assets/templates/assets/buildings/publicbuilding_list.html:4
 #: streetup/assets/views/core.py:782
 msgid "Bâtiments publics"
@@ -1039,12 +1039,12 @@ msgid "Code"
 msgstr "Code"
 
 #: streetup/assets/models/history.py:326
-#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:53
+#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:61
 msgid "Nom (FR)"
 msgstr "Nom (FR)"
 
 #: streetup/assets/models/history.py:327
-#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:58
+#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:66
 msgid "Nom (NL)"
 msgstr "Nom (NL)"
 
@@ -1195,14 +1195,14 @@ msgid "Structure"
 msgstr "Structure"
 
 #: streetup/assets/models/history.py:342
-#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:240
+#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:252
 #: streetup/assets/templates/assets/detail_generic.html:672
 #: streetup/assets/views/export.py:109
 msgid "Longitude"
 msgstr "Longitude"
 
 #: streetup/assets/models/history.py:343
-#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:235
+#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:247
 #: streetup/assets/templates/assets/detail_generic.html:683
 #: streetup/assets/views/export.py:110
 msgid "Latitude"
@@ -2658,8 +2658,8 @@ msgid "Choisissez le format d'export :"
 msgstr "Choisissez le format d'export :"
 
 #: streetup/assets/templates/assets/base_assets_index.html:320
-#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:24
-#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:251
+#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:32
+#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:263
 #: streetup/assets/templates/assets/components/add_asset_modal.html:138
 #: streetup/assets/templates/assets/components/asset_documents.html:87
 #: streetup/assets/templates/assets/components/asset_location_link.html:75
@@ -2691,7 +2691,7 @@ msgid "Annuler"
 msgstr "Annuler"
 
 #: streetup/assets/templates/assets/buildings/publicbuilding_detail.html:25
-#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:15
+#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:23
 #: streetup/assets/templates/assets/permissions/panel.html:69
 #: streetup/assets/templates/assets/permissions/panel.html:111
 #: streetup/assets/templates/assets/permissions/panel.html:211
@@ -2898,52 +2898,59 @@ msgid "Aucune intervention enregistrée pour ce bâtiment."
 msgstr "Aucune modification enregistrée pour cet asset."
 
 #: streetup/assets/templates/assets/buildings/publicbuilding_form.html:4
-#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:19
+#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:27
 #, fuzzy
 #| msgid "Modifier les contrats"
 msgid "Modifier le bâtiment"
 msgstr "Modifier les contrats"
 
-#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:35
+#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:43
 msgid "Certains champs contiennent des erreurs."
 msgstr ""
 
-#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:35
+#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:43
 msgid "Veuillez vérifier les informations ci-dessous."
 msgstr ""
 
-#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:43
+#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:51
 #: streetup/assets/templates/assets/detail_generic.html:204
 msgid "Informations générales"
 msgstr "Informations générales"
 
-#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:48
+#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:56
 #, fuzzy
 #| msgid "Document de bâtiment"
 msgid "Code du bâtiment"
 msgstr "Documents des assets"
 
-#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:79
+#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:87
 msgid "Propriété & Gestion"
 msgstr ""
 
-#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:105
+#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:113
 msgid "Usage & Caractéristiques physiques"
 msgstr ""
 
-#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:159
+#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:167
 msgid "Bâtiment recevant du public (ERP / PMR)"
 msgstr ""
 
-#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:193
+#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:201
 msgid "Diagnostics & Énergie"
 msgstr ""
 
-#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:230
+#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:238
 msgid "Coordonnées géographiques (GPS WGS84)"
 msgstr ""
 
-#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:254
+#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:242
+msgid ""
+"Cliquez sur la carte ou déplacez le marqueur pour ajuster la position du "
+"bâtiment. Vous pouvez également rechercher une adresse ou basculer en vue "
+"orthophoto."
+msgstr ""
+
+#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:266
 #, fuzzy
 #| msgid "Historique des modifications"
 msgid "Enregistrer les modifications"
diff --git a/streetup/assets/locale/nl/LC_MESSAGES/django.mo b/streetup/assets/locale/nl/LC_MESSAGES/django.mo
index 7fc1e66..d29d7aa 100644
Binary files a/streetup/assets/locale/nl/LC_MESSAGES/django.mo and b/streetup/assets/locale/nl/LC_MESSAGES/django.mo differ
diff --git a/streetup/assets/locale/nl/LC_MESSAGES/django.po b/streetup/assets/locale/nl/LC_MESSAGES/django.po
index 389352c..f54c2f9 100644
--- a/streetup/assets/locale/nl/LC_MESSAGES/django.po
+++ b/streetup/assets/locale/nl/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-07-27 10:06+0200\n"
+"POT-Creation-Date: 2026-07-27 10:11+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -179,112 +179,112 @@ msgid "Emprise cartographique"
 msgstr "Cartografische omtrek"
 
 #: streetup/assets/models/buildings.py:96
-#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:63
+#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:71
 msgid "Adresse complète"
 msgstr "Volledig adres"
 
 #: streetup/assets/models/buildings.py:97
-#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:68
+#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:76
 #: streetup/assets/templates/assets/components/asset_model_card.html:38
 msgid "Description"
 msgstr "Beschrijving"
 
 #: streetup/assets/models/buildings.py:100
 #: streetup/assets/templates/assets/buildings/publicbuilding_detail.html:104
-#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:84
+#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:92
 #: streetup/assets/templates/assets/buildings/publicbuilding_list.html:99
 msgid "Propriétaire"
 msgstr "Netheid"
 
 #: streetup/assets/models/buildings.py:101
 #: streetup/assets/templates/assets/buildings/publicbuilding_detail.html:108
-#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:89
+#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:97
 msgid "Gestionnaire référent"
 msgstr ""
 
 #: streetup/assets/models/buildings.py:102
-#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:94
+#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:102
 msgid "Direction / Service occupant"
 msgstr ""
 
 #: streetup/assets/models/buildings.py:105
-#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:110
+#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:118
 msgid "Type d'usage principal"
 msgstr "Hoofdgebruikstype"
 
 #: streetup/assets/models/buildings.py:106
-#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:115
+#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:123
 msgid "Statut d'occupation"
 msgstr "Bezettingsstatus"
 
 #: streetup/assets/models/buildings.py:109
 #: streetup/assets/templates/assets/buildings/publicbuilding_detail.html:125
-#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:120
+#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:128
 msgid "Année de construction"
 msgstr "Bouwjaar"
 
 #: streetup/assets/models/buildings.py:110
-#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:125
+#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:133
 msgid "Nombre d'étages hors-sol"
 msgstr "Aantal bovengrondse verdiepingen"
 
 #: streetup/assets/models/buildings.py:111
-#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:130
+#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:138
 msgid "Nombre de niveaux en sous-sol"
 msgstr "Aantal kelderniveaus"
 
 #: streetup/assets/models/buildings.py:112
-#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:135
+#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:143
 msgid "Surface brute totale (m²)"
 msgstr "Totale bruto oppervlakte (m²)"
 
 #: streetup/assets/models/buildings.py:113
-#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:140
+#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:148
 msgid "Surface utile (m²)"
 msgstr "Nuttige oppervlakte (m²)"
 
 #: streetup/assets/models/buildings.py:116
-#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:151
+#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:159
 msgid "Accueil & Sécurité du Public (ERP / PMR)"
 msgstr "Publieksontvangst & Veiligheid (ERP / PMR)"
 
 #: streetup/assets/models/buildings.py:117
-#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:172
+#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:180
 msgid "Catégorie d'accueil / ERP"
 msgstr "Ontvangstcategorie / ERP"
 
 #: streetup/assets/models/buildings.py:118
-#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:177
+#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:185
 msgid "Type d'établissement / ERP"
 msgstr "Type inrichting / ERP"
 
 #: streetup/assets/models/buildings.py:119
-#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:182
+#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:190
 msgid "Jauge maximale d'accueil du public"
 msgstr "Maximale publiekscapaciteit"
 
 #: streetup/assets/models/buildings.py:122
-#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:198
+#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:206
 msgid "Performance Énergétique (PEB / DPE / EPC)"
 msgstr "Energieprestatie (PEB / DPE / EPC)"
 
 #: streetup/assets/models/buildings.py:123
-#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:203
+#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:211
 msgid "Émissions de Carbone & GES"
 msgstr "Koolstofemissies & BKG"
 
 #: streetup/assets/models/buildings.py:124
-#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:211
+#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:219
 msgid "Diagnostic Amiante réalisé"
 msgstr "Asbestdiagnose uitgevoerd"
 
 #: streetup/assets/models/buildings.py:125
-#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:219
+#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:227
 msgid "Diagnostic Plomb réalisé"
 msgstr "Looddiagnose uitgevoerd"
 
 #: streetup/assets/models/buildings.py:126
-#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:167
+#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:175
 msgid "Accessible PMR"
 msgstr "Accessoire"
 
@@ -295,7 +295,7 @@ msgstr "Openbaar gebouw"
 
 #: streetup/assets/models/buildings.py:130
 #: streetup/assets/templates/assets/buildings/publicbuilding_detail.html:18
-#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:13
+#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:21
 #: streetup/assets/templates/assets/buildings/publicbuilding_list.html:4
 #: streetup/assets/views/core.py:782
 msgid "Bâtiments publics"
@@ -1037,12 +1037,12 @@ msgid "Code"
 msgstr "Code"
 
 #: streetup/assets/models/history.py:326
-#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:53
+#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:61
 msgid "Nom (FR)"
 msgstr "Naam (FR)"
 
 #: streetup/assets/models/history.py:327
-#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:58
+#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:66
 msgid "Nom (NL)"
 msgstr "Naam (NL)"
 
@@ -1193,14 +1193,14 @@ msgid "Structure"
 msgstr "Structuur"
 
 #: streetup/assets/models/history.py:342
-#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:240
+#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:252
 #: streetup/assets/templates/assets/detail_generic.html:672
 #: streetup/assets/views/export.py:109
 msgid "Longitude"
 msgstr "Lengtegraad"
 
 #: streetup/assets/models/history.py:343
-#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:235
+#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:247
 #: streetup/assets/templates/assets/detail_generic.html:683
 #: streetup/assets/views/export.py:110
 msgid "Latitude"
@@ -2652,8 +2652,8 @@ msgid "Choisissez le format d'export :"
 msgstr "Kies exportformaat:"
 
 #: streetup/assets/templates/assets/base_assets_index.html:320
-#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:24
-#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:251
+#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:32
+#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:263
 #: streetup/assets/templates/assets/components/add_asset_modal.html:138
 #: streetup/assets/templates/assets/components/asset_documents.html:87
 #: streetup/assets/templates/assets/components/asset_location_link.html:75
@@ -2685,7 +2685,7 @@ msgid "Annuler"
 msgstr "Annuleren"
 
 #: streetup/assets/templates/assets/buildings/publicbuilding_detail.html:25
-#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:15
+#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:23
 #: streetup/assets/templates/assets/permissions/panel.html:69
 #: streetup/assets/templates/assets/permissions/panel.html:111
 #: streetup/assets/templates/assets/permissions/panel.html:211
@@ -2892,48 +2892,58 @@ msgid "Aucune intervention enregistrée pour ce bâtiment."
 msgstr "Geen interventie geregistreerd voor dit gebouw."
 
 #: streetup/assets/templates/assets/buildings/publicbuilding_form.html:4
-#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:19
+#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:27
 msgid "Modifier le bâtiment"
 msgstr "Gebouw bewerken"
 
-#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:35
+#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:43
 msgid "Certains champs contiennent des erreurs."
 msgstr "Sommige velden bevatten fouten."
 
-#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:35
+#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:43
 msgid "Veuillez vérifier les informations ci-dessous."
 msgstr "Controleer de onderstaande informatie."
 
-#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:43
+#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:51
 #: streetup/assets/templates/assets/detail_generic.html:204
 msgid "Informations générales"
 msgstr "Algemene informatie"
 
-#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:48
+#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:56
 msgid "Code du bâtiment"
 msgstr "Gebouwcode"
 
-#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:79
+#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:87
 msgid "Propriété & Gestion"
 msgstr "Eigendom & Beheer"
 
-#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:105
+#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:113
 msgid "Usage & Caractéristiques physiques"
 msgstr "Gebruik & Fysieke kenmerken"
 
-#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:159
+#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:167
 msgid "Bâtiment recevant du public (ERP / PMR)"
 msgstr "Publiek toegankelijk gebouw (ERP / PMR)"
 
-#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:193
+#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:201
 msgid "Diagnostics & Énergie"
 msgstr "Diagnoses & Energie"
 
-#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:230
+#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:238
 msgid "Coordonnées géographiques (GPS WGS84)"
 msgstr "Geografische coördinaten (GPS WGS84)"
 
-#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:254
+#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:242
+msgid ""
+"Cliquez sur la carte ou déplacez le marqueur pour ajuster la position du "
+"bâtiment. Vous pouvez également rechercher une adresse ou basculer en vue "
+"orthophoto."
+msgstr ""
+"Klik op de kaart of verplaats de marker om de positie van het gebouw aan "
+"te passen. U kunt ook naar een adres zoeken of overschakelen naar de "
+"luchtfotoweergave."
+
+#: streetup/assets/templates/assets/buildings/publicbuilding_form.html:266
 msgid "Enregistrer les modifications"
 msgstr "Wijzigingen opslaan"
 
diff --git a/streetup/assets/templates/assets/buildings/publicbuilding_form.html b/streetup/assets/templates/assets/buildings/publicbuilding_form.html
index 9ceba1e..f5c025b 100644
--- a/streetup/assets/templates/assets/buildings/publicbuilding_form.html
+++ b/streetup/assets/templates/assets/buildings/publicbuilding_form.html
@@ -224,12 +224,16 @@
             </div>
         </div>
 
-        <!-- Card 6: Géolocalisation (Coordonnées) -->
+        <!-- Card 6: Géolocalisation (Carte & Coordonnées) -->
         <div class="card shadow-sm mb-4">
             <div class="card-header bg-light fw-bold">
                 <i class="bi bi-geo-alt me-2"></i>{% translate "Coordonnées géographiques (GPS WGS84)" %}
             </div>
             <div class="card-body">
+                <p class="text-muted small mb-3">
+                    <i class="bi bi-info-circle me-1"></i>{% translate "Cliquez sur la carte ou déplacez le marqueur pour ajuster la position du bâtiment. Vous pouvez également rechercher une adresse ou basculer en vue orthophoto." %}
+                </p>
+                <div id="edit-building-map" style="height: 400px; width: 100%; border-radius: 8px; border: 1px solid #dee2e6;" class="mb-3"></div>
                 <div class="row g-3">
                     <div class="col-md-6">
                         <label for="{{ form.lat.id_for_label }}" class="form-label fw-semibold">{% translate "Latitude" %}</label>
@@ -256,4 +260,140 @@
         </div>
     </form>
 </div>
-{% endblock %}
+{% endblock content %}
+
+{% block script %}
+<script src="{% static 'common/layer-switcher-control.js' %}"></script>
+<script>
+document.addEventListener('DOMContentLoaded', function() {
+    const latInput = document.getElementById("{{ form.lat.id_for_label }}");
+    const lonInput = document.getElementById("{{ form.lon.id_for_label }}");
+
+    let initLat = parseFloat("{{ center_lat|default_if_none:'' }}") || parseFloat(latInput.value) || 50.8477;
+    let initLon = parseFloat("{{ center_lon|default_if_none:'' }}") || parseFloat(lonInput.value) || 4.3572;
+    let hasCoords = Boolean("{{ center_lat|default_if_none:'' }}" || (latInput && latInput.value));
+
+    const map = new maplibregl.Map({
+        container: 'edit-building-map',
+        style: window.MAP_STYLE_LIGHT || 'https://tiles.openfreemap.org/styles/positron',
+        center: [initLon, initLat],
+        zoom: hasCoords ? 17 : 12,
+    });
+
+    // 1. Navigation & Geolocate Controls
+    map.addControl(new maplibregl.NavigationControl(), 'bottom-right');
+    map.addControl(new maplibregl.GeolocateControl({ positionOptions: { enableHighAccuracy: true }, trackUserLocation: true }), 'bottom-right');
+
+    // 2. Custom Address Search Control
+    if (typeof AddressSearchControl !== 'undefined') {
+        const searchCtrl = new AddressSearchControl({
+            autocompleteUrl: "{% url 'common:autocomplete_street' %}"
+        });
+        map.addControl(searchCtrl, 'top-left');
+
+        searchCtrl.addEventListener('address-selected', function(e) {
+            if (e.detail && e.detail.lon && e.detail.lat) {
+                const lon = parseFloat(e.detail.lon);
+                const lat = parseFloat(e.detail.lat);
+                map.flyTo({ center: [lon, lat], zoom: 18 });
+                setMarkerPosition(lat, lon);
+            }
+        });
+    }
+
+    // 3. Orthophotos / Satellite LayerSwitcherControl
+    if (typeof LayerSwitcherControl !== 'undefined') {
+        const layerSwitcher = new LayerSwitcherControl({
+            layers: [
+                {
+                    id: 'ortho',
+                    name: 'Orthophotos',
+                    icon: 'satellite',
+                    group: 'ortho',
+                    layer: {
+                        type: 'raster',
+                        paint: { 'raster-opacity': 1 }
+                    },
+                    sublayers: [
+                        {
+                            id: 'urbis',
+                            name: window.MAP_ORTHO_WMS_NAME || 'Urbis (Bruxelles)',
+                            default: true,
+                            source: {
+                                type: 'raster',
+                                tiles: [
+                                    window.MAP_ORTHO_WMS_URL || 'https://geoservices-urbis.irisnet.be/geoserver/urbisgrid/wms?service=WMS&version=1.3.0&request=GetMap&layers=Ortho&styles=&format=image/png&transparent=true&width=256&height=256&crs=EPSG:3857&bbox={bbox-epsg-3857}'
+                                ],
+                                tileSize: 256,
+                                attribution: window.MAP_ORTHO_WMS_ATTRIBUTION || '© CIRB / Urbis'
+                            }
+                        },
+                        {
+                            id: 'vlaanderen',
+                            name: 'Vlaanderen 2023',
+                            source: {
+                                type: 'raster',
+                                tiles: ['https://geo.api.vlaanderen.be/OMW/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=omwrgb23vl&STYLE=&FORMAT=image/png&TILEMATRIXSET=GoogleMapsVL&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}'],
+                                tileSize: 256,
+                                attribution: '© Digitaal Vlaanderen - Orthofoto 2023'
+                            }
+                        }
+                    ]
+                }
+            ]
+        });
+        map.addControl(layerSwitcher, 'top-right');
+    }
+
+    // 4. Marker logic & Form synchronization
+    let marker = null;
+    if (hasCoords) {
+        marker = new maplibregl.Marker({ draggable: true, color: '#2B579A' })
+            .setLngLat([initLon, initLat])
+            .addTo(map);
+
+        marker.on('dragend', function() {
+            const lngLat = marker.getLngLat();
+            updateInputValues(lngLat.lat, lngLat.lng);
+        });
+    }
+
+    map.on('click', function(e) {
+        setMarkerPosition(e.lngLat.lat, e.lngLat.lng);
+    });
+
+    function setMarkerPosition(lat, lon) {
+        if (!marker) {
+            marker = new maplibregl.Marker({ draggable: true, color: '#2B579A' })
+                .setLngLat([lon, lat])
+                .addTo(map);
+
+            marker.on('dragend', function() {
+                const lngLat = marker.getLngLat();
+                updateInputValues(lngLat.lat, lngLat.lng);
+            });
+        } else {
+            marker.setLngLat([lon, lat]);
+        }
+        updateInputValues(lat, lon);
+    }
+
+    function updateInputValues(lat, lon) {
+        if (latInput) latInput.value = parseFloat(lat).toFixed(7);
+        if (lonInput) lonInput.value = parseFloat(lon).toFixed(7);
+    }
+
+    function syncMarkerFromInputs() {
+        const lat = parseFloat(latInput.value);
+        const lon = parseFloat(lonInput.value);
+        if (!isNaN(lat) && !isNaN(lon)) {
+            setMarkerPosition(lat, lon);
+            map.panTo([lon, lat]);
+        }
+    }
+
+    if (latInput) latInput.addEventListener('change', syncMarkerFromInputs);
+    if (lonInput) lonInput.addEventListener('change', syncMarkerFromInputs);
+});
+</script>
+{% endblock script %}
diff --git a/streetup/assets/views/buildings.py b/streetup/assets/views/buildings.py
index 67eb655..58d3d47 100644
--- a/streetup/assets/views/buildings.py
+++ b/streetup/assets/views/buildings.py
@@ -263,10 +263,24 @@ def publicbuilding_edit(request, pk):
 
     regional_terms = get_regional_terms(getattr(building, '_regional_standard', 'BE'))
 
+    center_lon, center_lat = None, None
+    if building.lon is not None and building.lat is not None:
+        center_lon, center_lat = building.lon, building.lat
+    elif building.geom:
+        try:
+            geom_4326 = building.geom.clone()
+            geom_4326.transform(4326)
+            centroid = geom_4326.centroid
+            center_lon, center_lat = centroid.x, centroid.y
+        except Exception:
+            pass
+
     context = {
         'building': building,
         'form': form,
         'regional_terms': regional_terms,
+        'center_lon': center_lon,
+        'center_lat': center_lat,
     }
     return render(request, 'assets/buildings/publicbuilding_form.html', context)