diff --git a/migration_vers_bdd_2021/migration_vmap2019_to_vmap2021/migration_vmap2019_to_vmap2021.fmw b/migration_vers_bdd_2021/migration_vmap2019_to_vmap2021/migration_vmap2019_to_vmap2021.fmw
index 2074f4ec4e5ed45bb15f567461ae3830b58e246c..6aeecb96bb4704a140d38bdef3674bfd7f59a296 100644
--- a/migration_vers_bdd_2021/migration_vmap2019_to_vmap2021/migration_vmap2019_to_vmap2021.fmw
+++ b/migration_vers_bdd_2021/migration_vmap2019_to_vmap2021/migration_vmap2019_to_vmap2021.fmw
@@ -2,6 +2,7 @@
#! <WORKSPACE
# Command-line to run this workspace:
# E:\install_program\fme_2019_2_3_b19822\fme.exe "E:\git\Developpement\Vitis 2020\Application\vmap-2021\migration_vers_bdd_2021\migration_vmap2019_to_vmap2021\migration_vmap2019_to_vmap2021.fmw"
+# --source_webservice "https://demovmap.veremes.net/rest_fr"
# --source_login_get_token "laurent"
# --source_password_get_token "vm_demo"
# --source_host "demovmap.veremes.net"
@@ -33,7 +34,7 @@
#! HISTORY=""
#! IGNORE_READER_FAILURE="No"
#! LAST_SAVE_BUILD="FME(R) 2019.2.3.0 (20200131 - Build 19822 - WIN64)"
-#! LAST_SAVE_DATE="2020-12-28T18:17:35"
+#! LAST_SAVE_DATE="2020-12-28T18:22:51"
#! LOG_FILE=""
#! LOG_MAX_RECORDED_FEATURES="200"
#! MARKDOWN_DESCRIPTION=""
@@ -52,7 +53,7 @@
#! TITLE=""
#! USAGE=""
#! USE_MARKDOWN=""
-#! VIEW_POSITION="1738.3 -239.26"
+#! VIEW_POSITION="-1787.13 -239.26"
#! WARN_INVALID_XFORM_PARAM="Yes"
#! WORKSPACE_VERSION="1"
#! ZOOM_SCALE="64"
@@ -489,6 +490,11 @@
#! </FMESERVER>
#! <GLOBAL_PARAMETERS>
#! <GLOBAL_PARAMETER
+#! GUI_LINE="GUI OPTIONAL TEXT_OR_ATTR source_webservice URL du webservice de vMap :"
+#! DEFAULT_VALUE="https://demovmap.veremes.net/rest_fr"
+#! IS_STAND_ALONE="true"
+#! />
+#! <GLOBAL_PARAMETER
#! GUI_LINE="GUI OPTIONAL TEXT_OR_ATTR source_login_get_token Login Get Token (BDD source) :"
#! DEFAULT_VALUE="laurent"
#! IS_STAND_ALONE="true"
@@ -734,7 +740,7 @@
#! <XFORM_PARM PARM_NAME="STATUS_CODE_ATTR" PARM_VALUE="_http_status_code"/>
#! <XFORM_PARM PARM_NAME="TARGET_ATTR" PARM_VALUE="_response_body_get_token"/>
#! <XFORM_PARM PARM_NAME="TARGET_ATTR_ENCODING" PARM_VALUE="auto-detect"/>
-#! <XFORM_PARM PARM_NAME="TARGET_URL" PARM_VALUE="https:<solidus><solidus>demovmap.veremes.net<solidus>rest_fr<solidus>vitis<solidus>privatetoken"/>
+#! <XFORM_PARM PARM_NAME="TARGET_URL" PARM_VALUE="$(source_webservice)<solidus>vitis<solidus>privatetoken"/>
#! <XFORM_PARM PARM_NAME="TRANSFER_TIMEOUT_LENGTH" PARM_VALUE="90"/>
#! <XFORM_PARM PARM_NAME="TRANSFORMER_GROUP" PARM_VALUE=""/>
#! <XFORM_PARM PARM_NAME="UPLOAD_BODY" PARM_VALUE="user=$(source_login_get_token)<amp>password=$(source_password_get_token)<amp>duration=60"/>
@@ -1298,6 +1304,8 @@
FME_PYTHON_VERSION 37
GUI IGNORE SourceDataset_POSTGIS_1,POSTGIS_IN_FME_CONNECTION_GROUP_POSTGIS_1,POSTGIS_IN_HOST_POSTGIS_1,POSTGIS_IN_PORT_POSTGIS_1,POSTGIS_IN_USER_NAME_POSTGIS_1,POSTGIS_IN_PASSWORD_POSTGIS_1,POSTGIS_IN_SSLMODE_POSTGIS_1,POSTGIS_IN_FME_GROUP_NAMED1_POSTGIS_1,POSTGIS_IN_WHERE_CLAUSE_POSTGIS_1,POSTGIS_IN_USE_SEARCH_ENVELOPE_POSTGIS_1,POSTGIS_IN_SEARCH_ENVELOPE_MINX_POSTGIS_1,POSTGIS_IN_SEARCH_ENVELOPE_MINY_POSTGIS_1,POSTGIS_IN_SEARCH_ENVELOPE_MAXX_POSTGIS_1,POSTGIS_IN_SEARCH_ENVELOPE_MAXY_POSTGIS_1,POSTGIS_IN_SEARCH_ENVELOPE_COORDINATE_SYSTEM_POSTGIS_1,POSTGIS_IN_CLIP_TO_ENVELOPE_POSTGIS_1,POSTGIS_IN_SEARCH_METHOD_POSTGIS_1,POSTGIS_IN_ADVANCED_POSTGIS_1,POSTGIS_IN_FEATURES_PER_FETCH_POSTGIS_1,POSTGIS_IN_BEGIN_SQL_POSTGIS_1,POSTGIS_IN_END_SQL_POSTGIS_1,POSTGIS_IN_SCHEMAS_FOR_TABLE_LISTING_POSTGIS_1
+DEFAULT_MACRO source_webservice https://demovmap.veremes.net/rest_fr
+GUI OPTIONAL TEXT source_webservice URL du webservice de vMap :
DEFAULT_MACRO source_login_get_token laurent
GUI OPTIONAL TEXT source_login_get_token Login Get Token (BDD source) :
DEFAULT_MACRO source_password_get_token vm_demo
@@ -1484,7 +1492,7 @@ FACTORY_DEF * BranchingFactory FACTORY_NAME "Creator_CREATED Brancher -1 21"
# -------------------------------------------------------------------------
FACTORY_DEF * TeeFactory FACTORY_NAME "$(WB_CURRENT_CONTEXT)_CREATOR_BRANCH_TARGET" INPUT FEATURE_TYPE * OUTPUT FEATURE_TYPE *
# -------------------------------------------------------------------------
-FACTORY_DEF * HTTPFactory FACTORY_NAME HTTPCaller_2 INPUT FEATURE_TYPE Creator_CREATED TARGET_URL "https:<solidus><solidus>demovmap.veremes.net<solidus>rest_fr<solidus>vitis<solidus>privatetoken" HTTP_METHOD POST SAVE_FILE NO OUTPUT_FILENAME "<Unused>" OUTPUT_DIRECTORY "<Unused>" FILE_EXTENSION "<Unused>" TARGET_ATTR "_response_body_get_token" FILE_PATH_ATTR "<Unused>" UPLOAD_FILE "<Unused>" UPLOAD_BODY "@EvaluateExpression(FDIV,STRING_ENCODED,user=$(source_login_get_token$encode)<amp>password=$(source_password_get_token$encode)<amp>duration=60,HTTPCaller_2)" MULTIPART_UPLOAD NO UPLOAD_CONTENT_TYPE "application/x-www-form-urlencoded" COMBINED_MULTIPART_TABLE REQUEST_HEADER_TABLE ADDITIONAL_URL_PARAMETERS AUTH_USERNAME "<Unused>" AUTH_PASSWORD "<Unused>" AUTH_METHOD "<Unused>" TARGET_ATTRIBUTE_ENCODING auto-detect RESPONSE_HEADER_LIST_ATTR "" STATUS_CODE_ATTR "_http_status_code" ERROR_ATTR "_error" CONNECTION_TIMEOUT_LENGTH 60 TRANSFER_TIMEOUT_LENGTH 90 FOLLOW_REDIRECTS Yes VERIFY_SSL_CERTIFICATES Yes NAMED_CONNECTION "<Unused>" USE_COOKIES No OUTPUT OUTPUT FEATURE_TYPE HTTPCaller_2_Output OUTPUT REJECTED FEATURE_TYPE HTTPCaller_2_<REJECTED>
+FACTORY_DEF * HTTPFactory FACTORY_NAME HTTPCaller_2 INPUT FEATURE_TYPE Creator_CREATED TARGET_URL "@EvaluateExpression(FDIV,STRING_ENCODED,$(source_webservice$encode)<solidus>vitis<solidus>privatetoken,HTTPCaller_2)" HTTP_METHOD POST SAVE_FILE NO OUTPUT_FILENAME "<Unused>" OUTPUT_DIRECTORY "<Unused>" FILE_EXTENSION "<Unused>" TARGET_ATTR "_response_body_get_token" FILE_PATH_ATTR "<Unused>" UPLOAD_FILE "<Unused>" UPLOAD_BODY "@EvaluateExpression(FDIV,STRING_ENCODED,user=$(source_login_get_token$encode)<amp>password=$(source_password_get_token$encode)<amp>duration=60,HTTPCaller_2)" MULTIPART_UPLOAD NO UPLOAD_CONTENT_TYPE "application/x-www-form-urlencoded" COMBINED_MULTIPART_TABLE REQUEST_HEADER_TABLE ADDITIONAL_URL_PARAMETERS AUTH_USERNAME "<Unused>" AUTH_PASSWORD "<Unused>" AUTH_METHOD "<Unused>" TARGET_ATTRIBUTE_ENCODING auto-detect RESPONSE_HEADER_LIST_ATTR "" STATUS_CODE_ATTR "_http_status_code" ERROR_ATTR "_error" CONNECTION_TIMEOUT_LENGTH 60 TRANSFER_TIMEOUT_LENGTH 90 FOLLOW_REDIRECTS Yes VERIFY_SSL_CERTIFICATES Yes NAMED_CONNECTION "<Unused>" USE_COOKIES No OUTPUT OUTPUT FEATURE_TYPE HTTPCaller_2_Output OUTPUT REJECTED FEATURE_TYPE HTTPCaller_2_<REJECTED>
DEFAULT_MACRO _WB_BYPASS_TERMINATION No
FACTORY_DEF * TeeFactory FACTORY_NAME HTTPCaller_2_<Rejected> INPUT FEATURE_TYPE HTTPCaller_2_<REJECTED> OUTPUT FAILED FEATURE_TYPE * @Abort(ENCODED, HTTPCaller_2<space>output<space>a<space><lt>Rejected<gt><space>feature.<space><space>To<space>continue<space>translation<space>when<space>features<space>are<space>rejected<comma><space>change<space><apos>Workspace<space>Parameters<apos><space><gt><space>Translation<space><gt><space><apos>Rejected<space>Feature<space>Handling<apos><space>to<space><apos>Continue<space>Translation<apos>)
# -------------------------------------------------------------------------
@@ -1506,8 +1514,8 @@ FACTORY_DEF {*} QueryFactory FACTORY_NAME FeatureReader INPUT FEATURE_TYP
DEFAULT_MACRO _WB_BYPASS_TERMINATION No
FACTORY_DEF * TeeFactory FACTORY_NAME FeatureReader_<Rejected> INPUT FEATURE_TYPE FeatureReader_<REJECTED> OUTPUT FAILED FEATURE_TYPE * @Abort(ENCODED, FeatureReader<space>output<space>a<space><lt>Rejected<gt><space>feature.<space><space>To<space>continue<space>translation<space>when<space>features<space>are<space>rejected<comma><space>change<space><apos>Workspace<space>Parameters<apos><space><gt><space>Translation<space><gt><space><apos>Rejected<space>Feature<space>Handling<apos><space>to<space><apos>Continue<space>Translation<apos>)
# -------------------------------------------------------------------------
-INCLUDE [ set macroLine "MACRO AttributeKeeper_8a1a4b9f_9311_493b_9068_a42a955bebc122_LIST_EXP "; foreach attr [split ""] { set attr [FME_DecodeText $attr]; set attr [regsub "{}$" $attr "{}.*"]; set attr [regsub -all "{}" $attr "\\{\[0-9\]+\\}"]; append macroLine ",^$attr$"; }; puts $macroLine; ]
-FACTORY_DEF {*} TeeFactory FACTORY_NAME AttributeKeeper INPUT FEATURE_TYPE FeatureReader_s_vm4ms.ms_layer OUTPUT { FEATURE_TYPE AttributeKeeper_OUTPUT @KeepAttributes(fme_encoded,_response_body_get_token,json_index,ms_layer_id,definition,fme_pcre_match,"^fme_$(AttributeKeeper_8a1a4b9f_9311_493b_9068_a42a955bebc122_LIST_EXP)") }
+INCLUDE [ set macroLine "MACRO AttributeKeeper_8a1a4b9f_9311_493b_9068_a42a955bebc125_LIST_EXP "; foreach attr [split ""] { set attr [FME_DecodeText $attr]; set attr [regsub "{}$" $attr "{}.*"]; set attr [regsub -all "{}" $attr "\\{\[0-9\]+\\}"]; append macroLine ",^$attr$"; }; puts $macroLine; ]
+FACTORY_DEF {*} TeeFactory FACTORY_NAME AttributeKeeper INPUT FEATURE_TYPE FeatureReader_s_vm4ms.ms_layer OUTPUT { FEATURE_TYPE AttributeKeeper_OUTPUT @KeepAttributes(fme_encoded,_response_body_get_token,json_index,ms_layer_id,definition,fme_pcre_match,"^fme_$(AttributeKeeper_8a1a4b9f_9311_493b_9068_a42a955bebc125_LIST_EXP)") }
# -------------------------------------------------------------------------
FACTORY_DEF * HTTPFactory FACTORY_NAME HTTPCaller INPUT FEATURE_TYPE AttributeKeeper_OUTPUT TARGET_URL "https:<solidus><solidus>demovmap.veremes.net<solidus>rest_fr<solidus>vm4ms<solidus>layers<solidus>MapFile" HTTP_METHOD POST SAVE_FILE NO OUTPUT_FILENAME "<Unused>" OUTPUT_DIRECTORY "<Unused>" FILE_EXTENSION "<Unused>" TARGET_ATTR "_response_body" FILE_PATH_ATTR "<Unused>" UPLOAD_FILE "<Unused>" UPLOAD_BODY "------WebKitFormBoundaryFmtUm4WD3x7exEIm<lf>Content-Disposition:<space>form-data<semicolon><space>name=<quote>ms_layer_id<quote><lf><lf>9<lf>------WebKitFormBoundaryFmtUm4WD3x7exEIm<lf>" MULTIPART_UPLOAD NO UPLOAD_CONTENT_TYPE "multipart/form-data; boundary=----WebKitFormBoundaryFmtUm4WD3x7exEIm" COMBINED_MULTIPART_TABLE REQUEST_HEADER_TABLE Token;@EvaluateExpression(FDIV,STRING_ENCODED,<at>Value<openparen>_response_body_get_token<closeparen>,HTTPCaller) ADDITIONAL_URL_PARAMETERS AUTH_USERNAME "<Unused>" AUTH_PASSWORD "<Unused>" AUTH_METHOD "<Unused>" TARGET_ATTRIBUTE_ENCODING auto-detect RESPONSE_HEADER_LIST_ATTR "" STATUS_CODE_ATTR "_http_status_code" ERROR_ATTR "_error" CONNECTION_TIMEOUT_LENGTH 60 TRANSFER_TIMEOUT_LENGTH 90 FOLLOW_REDIRECTS Yes VERIFY_SSL_CERTIFICATES Yes NAMED_CONNECTION "<Unused>" USE_COOKIES No OUTPUT OUTPUT FEATURE_TYPE HTTPCaller_Output OUTPUT REJECTED FEATURE_TYPE HTTPCaller_<REJECTED>
DEFAULT_MACRO _WB_BYPASS_TERMINATION No