Merge branch 'main' into coopBattery

Author: AteZenmo

_alp/Agents/EnergyModel/EmbeddedObjects.xml

@@ -2610,9 +2610,6 @@
 			</GenericParameterSubstituteReference>
 		</GenericParameterSubstitute>
 		<Parameters>
-			<Parameter>
-				<Name><![CDATA[p_gisRegion]]></Name>
-			</Parameter>
 			<Parameter>
 				<Name><![CDATA[p_gridConnectionCategory]]></Name>
 			</Parameter>
@@ -2716,7 +2713,7 @@
 				<Name><![CDATA[p_nbHouseholds]]></Name>
 			</Parameter>
 			<Parameter>
-				<Name><![CDATA[p_municipality]]></Name>
+				<Name><![CDATA[p_municipalityCode]]></Name>
 			</Parameter>
 			<Parameter>
 				<Name><![CDATA[p_nbServices]]></Name>

_alp/Agents/EnergyModel/Variables.xml

@@ -2391,6 +2391,31 @@
 			</ParameterEditor>
 		</Properties>
 	</Variable>
+	<Variable Class="Parameter">
+		<Id>1743087797088</Id>
+		<Name><![CDATA[p_regionName]]></Name>
+		<X>360</X>
+		<Y>-50</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Properties SaveInSnapshot="true" ModificatorType="STATIC">
+			<Type><![CDATA[String]]></Type>
+			<UnitType>NONE</UnitType>
+			<SdArray>false</SdArray>
+			<ParameterEditor>
+				<Id>1743087797086</Id>
+				<EditorContolType>TEXT_BOX</EditorContolType>
+				<MinSliderValue>0</MinSliderValue>
+				<MaxSliderValue>100</MaxSliderValue>
+				<DelimeterType>NO_DELIMETER</DelimeterType>
+			</ParameterEditor>
+		</Properties>
+	</Variable>
 	<Variable Class="CollectionVariable">
 		<Id>1663238323139</Id>
 		<Name><![CDATA[c_connectionOwners]]></Name>

_alp/Agents/GCNeighborhood/Variables.xml

@@ -494,32 +494,6 @@
 			<Type><![CDATA[double]]></Type>
 		</Properties>
 	</Variable>
-	<Variable Class="Parameter">
-		<Id>1718725906048</Id>
-		<Name><![CDATA[p_gisRegion]]></Name>
-		<X>50</X>
-		<Y>560</Y>
-		<Label>
-			<X>10</X>
-			<Y>0</Y>
-		</Label>
-		<PublicFlag>false</PublicFlag>
-		<PresentationFlag>true</PresentationFlag>
-		<ShowLabel>true</ShowLabel>
-		<Properties SaveInSnapshot="true" ModificatorType="STATIC">
-			<Type><![CDATA[GISRegion]]></Type>
-			<UnitType>NONE</UnitType>
-			<UnitOfValue Class="TimeUnits">SECOND</UnitOfValue>
-			<SdArray>false</SdArray>
-			<ParameterEditor>
-				<Id>1718725906046</Id>
-				<EditorContolType>TEXT_BOX</EditorContolType>
-				<MinSliderValue>0</MinSliderValue>
-				<MaxSliderValue>100</MaxSliderValue>
-				<DelimeterType>NO_DELIMETER</DelimeterType>
-			</ParameterEditor>
-		</Properties>
-	</Variable>
 	<Variable Class="Parameter">
 		<Id>1722588367044</Id>
 		<Name><![CDATA[p_thresholdCOP_hybridHeatpump]]></Name>
@@ -601,7 +575,7 @@
 	</Variable>
 	<Variable Class="Parameter">
 		<Id>1730911077796</Id>
-		<Name><![CDATA[p_municipality]]></Name>
+		<Name><![CDATA[p_municipalityCode]]></Name>
 		<X>1680</X>
 		<Y>930</Y>
 		<Label>