Show Tibet as part of China on map (#11930)

* Revert "free tibet!"

This reverts commit 4e47c8ab.

* Remove unneeded translations

* adjust API

* fix tests

* update screenshots

* update tests files

* update screenshot

* Do not change detected location

* update tests

* Fix continent detection for old records

* submodule update

* update screenshots

* Cleanup

* use group by filters only if needed

* make filter work for datatable maps

plugins/UserCountryMap/svg/TIB.svg

-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg  PUBLIC '-//W3C//DTD SVG 1.1//EN'  'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'><svg enable_background="new 0 0 450 301" height="301px" pretty_print="False" style="stroke-linejoin: round; stroke:#000; fill: none;" version="1.1" viewBox="0 0 450 301" width="450px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><defs><style type="text/css"><![CDATA[path { fill-rule: evenodd; }]]></style></defs><metadata><views><view h="301.0" padding="0.06" w="450"><proj id="laea" lat0="30.4857206345" lon0="97.3202376267"/><bbox h="139.79" w="240.55" x="791.63" y="909.4"/></view></views></metadata><g class="" id="context"><path d="M39,74L36,87L41,96L41,104L40,113L34,116L31,112L31,109L26,109L24,111L25,116L28,125L27,128L29,132L27,137L27,139L33,137L35,140L38,146L41,150L44,150L50,155L52,155L51,161L59,164L62,168L65,170L67,176L72,174L76,169L79,168L88,172L88,176L97,184L98,184L109,193L113,201L115,202L120,200L125,202L126,206L127,210L129,211L134,216L134,218L139,220L144,219L142,222L142,226L147,227L148,226L152,228L154,226L157,230L158,236L161,237L161,233L163,231L164,234L170,236L171,233L180,238L182,240L191,242L197,240L202,241L204,239L215,238L216,239L217,243L215,252L217,255L219,251L227,243L232,237L240,234L246,235L248,237L248,240L254,240L262,243L265,241L274,244L274,248L279,249L283,248L289,247L290,248L295,244L299,240L303,236L308,229L315,229L323,224L329,218L337,215L338,218L351,221L360,213L364,212L370,218L367,219L366,225L370,222L374,226L370,235L368,236L386,237L390,240L394,233L395,233L403,241L404,241L408,241L410,237L413,240L416,237L415,230L417,228L417,223L419,222L422,226L426,217L423,206L425,201L423,196L422,182L419,179L419,176L416,169L421,168L415,162L411,156L412,154L407,147L407,145L403,143L397,141L391,142L389,147L385,153L378,154L379,160L373,159L370,155L368,156L368,163L367,164L364,160L361,160L352,158L352,149L350,147L347,147L342,141L337,137L332,138L327,141L321,139L313,139L309,136L301,134L291,134L290,132L286,131L280,126L275,120L272,119L264,123L261,123L253,116L253,114L243,101L246,98L247,94L246,87L248,81L243,80L242,71L244,70L248,62L249,60L244,59L243,58L244,54L247,54L239,49L226,45L206,45L205,44L198,45L183,48L179,54L173,55L170,57L162,54L158,55L155,57L144,60L133,60L122,56L120,50L116,50L112,49L104,54L101,57L94,57L93,55L83,54L71,49L65,58L62,59L62,65L58,70L47,68L43,71L41,74L39,74Z " data-iso="TIB"/><path d="M234,297L234,288L231,282L227,287L221,283L217,276L217,279L214,280L206,272L206,275L202,280L198,287L208,297L212,298L212,299L233,299L234,297Z " data-iso="BGD"/><path d="M274,247L271,243L266,241L263,243L255,240L248,239L248,236L243,234L237,235L223,246L222,249L218,252L217,255L216,261L216,263L222,267L225,267L231,270L242,270L246,267L254,270L262,270L273,270L280,270L282,260L280,256L278,256L273,253L274,248L274,247Z " data-iso="BTN"/><path d="M309,729L308,731L305,726L304,725L308,720L310,726L309,729Z M306,718L304,720L303,718L305,716L306,718Z M302,702L300,700L300,699L302,702Z M293,697L292,698L291,696L293,697Z M285,677L283,675L285,674L285,677Z M279,644L276,644L275,639L279,636L281,641L279,644Z M284,625L282,624L282,622L284,625Z M291,611L292,614L291,612L291,611Z M284,622L281,618L283,609L285,603L285,594L287,588L288,580L290,578L293,583L290,587L291,599L288,601L288,607L285,612L285,620L284,622Z M66,172L64,172L53,180L51,184L48,192L44,196L43,199L49,206L51,205L63,215L69,222L76,227L81,228L87,234L91,234L92,238L103,243L105,242L114,244L116,243L122,244L130,247L131,254L140,259L142,262L150,261L152,266L157,265L172,272L179,272L183,275L185,273L198,275L201,268L200,252L203,242L202,241L202,240L209,238L212,237L216,239L217,245L215,250L216,254L217,255L216,261L216,263L222,267L225,267L231,270L242,270L246,267L254,270L262,270L273,270L280,270L282,260L280,256L278,256L273,253L274,248L275,248L281,249L290,248L295,245L295,242L307,230L318,228L321,226L323,223L325,222L337,215L338,218L346,220L349,221L353,219L353,217L364,212L370,218L366,221L366,224L370,222L375,228L370,233L372,236L383,238L385,237L389,240L390,241L390,248L388,248L381,254L381,259L385,265L385,266L381,265L376,261L364,264L361,267L352,274L345,278L343,283L344,290L340,298L339,301L333,305L332,309L335,313L332,320L326,330L324,334L321,340L320,339L305,336L306,342L306,352L306,356L301,359L301,362L299,368L301,374L296,382L289,382L288,382L287,366L284,360L284,351L282,343L276,343L275,347L272,350L271,357L267,358L265,355L263,353L262,355L261,349L259,344L261,336L265,332L275,331L277,327L280,324L282,320L283,315L288,316L288,314L280,308L274,308L264,307L246,307L242,306L233,301L234,297L234,288L231,282L227,287L221,283L217,276L217,279L214,280L206,272L206,275L202,280L198,287L208,297L212,298L213,300L215,302L214,304L205,303L201,310L198,309L195,314L197,319L209,325L208,331L205,339L208,344L207,348L212,350L210,354L211,363L213,372L212,379L210,379L212,386L207,385L205,387L204,383L206,377L204,374L202,381L199,386L196,383L195,385L192,385L194,373L189,380L183,384L172,385L164,392L164,395L165,403L161,413L155,416L148,421L134,425L134,421L132,420L127,423L126,426L130,425L126,428L116,436L108,445L99,454L89,458L78,467L73,470L64,473L59,477L57,479L55,489L53,490L44,493L36,491L26,504L22,503L21,501L12,501L10,503L5,511L4,517L5,531L3,537L6,554L3,548L0,550L1,552L6,557L2,572L-0,577L-4,581L-8,587L-11,596L-10,599L-13,602L-10,601L-10,615L-11,625L-22,624L-25,626L-25,630L-32,637L-33,639L-32,645L-28,647L-33,646L-46,648L-52,652L-54,661L-56,663L-63,667L-69,669L-73,666L-80,659L-87,648L-92,638L-93,633L-94,622L-91,627L-91,631L-90,632L-91,622L-95,612L-99,601L-100,594L-102,587L-105,578L-112,569L-116,556L-118,544L-120,526L-122,521L-123,510L-131,495L-131,489L-133,487L-130,487L-133,482L-131,481L-136,475L-138,470L-139,460L-139,443L-140,435L-139,433L-141,426L-141,415L-141,405L-138,402L-138,397L-141,400L-140,393L-137,394L-141,391L-140,387L-141,386L-141,380L-140,374L-134,364L-133,358L-136,349L-136,342L-131,339L-127,338L-137,336L-136,330L-135,326L-129,325L-141,322L-140,324L-141,327L-147,331L-143,336L-143,339L-150,346L-160,348L-164,350L-172,351L-178,350L-183,346L-191,336L-195,327L-204,313L-207,308L-205,302L-201,307L-182,305L-173,295L-177,297L-178,296L-187,297L-191,298L-199,294L-207,287L-210,283L-212,273L-211,272L-204,269L-207,269L-214,272L-216,272L-216,265L-211,264L-204,266L-203,259L-186,263L-181,266L-179,267L-175,265L-165,264L-165,268L-161,269L-155,267L-156,263L-154,260L-157,247L-158,242L-157,237L-165,233L-167,228L-163,215L-164,212L-173,207L-175,204L-171,196L-163,191L-156,183L-150,181L-146,184L-146,186L-144,190L-134,189L-129,190L-122,189L-119,184L-115,181L-110,174L-97,169L-88,158L-83,150L-77,149L-71,146L-71,141L-68,140L-63,135L-54,130L-55,128L-53,114L-50,111L-47,110L-37,107L-35,106L-40,99L-44,98L-46,94L-45,91L-51,89L-50,86L-55,77L-54,76L-53,66L-47,62L-52,59L-50,54L-53,52L-48,45L-42,43L-25,51L-22,53L-17,55L-2,52L-1,52L0,53L7,49L10,47L10,46L13,45L21,42L24,41L26,40L26,40L30,41L29,46L31,61L32,62L38,65L42,71L41,73L37,75L36,85L41,96L41,103L40,112L37,115L34,115L30,109L24,109L25,117L29,124L27,127L29,132L27,136L27,139L32,137L40,149L45,150L50,155L52,155L52,160L53,161L66,170L66,172Z " data-iso="IND"/><path d="M24,40L19,39L17,38L10,34L8,32L8,35L9,38L10,44L10,46L13,45L21,42L24,41L26,40L24,40Z " data-iso="KAS"/><path d="M404,241L401,237L399,237L395,234L394,234L391,240L390,241L390,248L388,248L381,254L381,259L385,265L385,266L381,265L376,261L364,264L361,267L352,274L345,278L343,283L344,290L340,298L340,299L412,299L418,294L416,292L418,287L419,278L419,267L418,264L417,255L413,253L410,256L405,241L404,241Z " data-iso="MMR"/><path d="M200,241L185,241L182,240L177,236L171,233L168,237L163,232L161,236L159,236L154,227L148,227L142,224L144,219L142,218L134,217L126,209L124,202L121,200L114,202L107,191L101,188L94,181L90,178L87,171L79,169L75,169L71,175L67,174L66,172L64,172L53,180L51,184L48,192L44,196L43,199L49,206L51,205L63,215L69,222L76,227L81,228L87,234L91,234L92,238L103,243L105,242L114,244L116,243L122,244L130,247L131,254L140,259L142,262L150,261L152,266L157,265L172,272L179,272L183,275L185,273L198,275L201,268L200,252L203,242L202,241L200,241Z " data-iso="NPL"/><path d="M0,53L7,49L10,47L10,46L10,44L9,38L8,35L8,32L7,32L5,29L5,26L0,27L0,53L0,53Z " data-iso="PAK"/><path d="M8,32L10,34L17,38L19,39L24,40L26,40L26,40L26,40L30,41L29,46L31,61L32,62L38,65L42,71L41,73L39,74L41,74L43,71L47,68L58,70L62,65L62,59L65,58L71,49L83,54L93,55L94,57L101,57L104,54L112,49L116,50L120,50L122,56L133,60L144,60L155,57L158,55L162,54L170,57L173,55L179,54L183,48L198,45L205,44L206,45L226,45L239,49L247,54L244,54L243,58L244,59L249,60L248,62L244,70L242,71L243,80L248,81L246,87L247,94L246,98L243,101L253,114L253,116L261,123L264,123L272,119L275,120L280,126L286,131L290,132L291,134L301,134L309,136L313,139L321,139L327,141L332,138L337,137L342,141L347,147L350,147L352,149L352,158L361,160L364,160L367,164L368,163L368,156L370,155L373,159L379,160L378,154L385,153L389,147L391,142L397,141L403,143L407,145L407,147L412,154L411,156L415,162L421,168L416,169L419,176L419,179L422,182L423,196L425,201L423,206L426,217L422,226L419,222L417,223L417,228L415,230L416,237L413,240L410,237L408,241L404,241L404,241L405,241L410,256L413,253L417,255L418,264L419,267L419,278L418,287L416,292L418,294L412,299L450,299L450,0L0,0L0,27L5,26L5,29L7,32L8,32Z " data-iso="CHN"/></g><g class="" id="regions"><path d="M343,145L339,148L340,150L337,155L339,157L340,163L342,163L344,168L344,172L339,174L338,170L335,166L330,169L329,171L331,177L330,179L324,178L318,181L320,182L327,187L327,187L327,187L331,185L331,186L336,186L338,185L342,186L349,184L358,187L358,188L361,191L362,193L367,194L368,193L371,190L372,191L375,196L377,196L375,201L373,204L375,207L380,208L383,206L385,207L385,210L391,212L392,220L394,216L398,217L401,220L406,220L406,222L413,228L415,233L418,235L418,235L416,234L416,230L417,229L418,223L419,222L421,227L423,226L424,221L423,218L425,217L425,210L423,207L425,201L423,194L422,186L420,180L419,179L419,176L415,170L416,168L419,170L420,168L411,155L412,154L409,150L407,146L402,142L399,141L394,142L391,141L391,145L389,146L389,151L388,151L383,152L383,153L381,154L378,153L380,156L380,160L380,161L375,160L370,155L367,158L369,160L368,164L367,161L361,159L360,160L358,158L355,159L352,153L353,149L350,147L347,147L343,145L343,145Z " data-fips="" data-iso3="TIB" data-name="Changdu"/><path d="M244,196L244,196L238,198L241,203L240,205L238,206L238,208L249,211L250,211L250,211L252,213L257,211L261,211L266,207L276,207L279,207L283,207L284,208L292,205L293,205L293,205L291,201L289,202L287,200L287,198L291,198L292,196L296,192L296,192L296,192L291,191L288,190L287,192L283,193L281,190L281,185L278,180L274,181L272,173L269,172L267,173L264,174L262,172L259,174L256,182L257,185L252,189L249,188L244,196L244,196Z " data-fips="" data-iso3="TIB" data-name="Lasà"/><path d="M138,60L138,63L137,65L137,68L140,71L144,73L143,75L148,79L146,82L143,87L144,91L149,94L152,95L157,97L157,96L160,101L165,105L168,110L169,110L172,114L172,118L173,122L169,125L161,127L159,127L156,129L153,135L151,138L152,141L151,148L153,148L154,150L159,153L163,158L169,160L170,165L170,165L170,165L172,167L173,170L174,176L177,180L178,178L179,179L183,177L180,171L182,169L184,169L185,171L188,169L188,176L190,178L194,178L195,181L199,184L201,183L206,184L210,187L213,188L214,191L218,188L230,187L231,188L238,189L239,190L242,195L244,196L244,196L244,196L249,188L252,189L257,185L256,182L259,174L262,172L264,174L267,173L269,172L272,173L274,181L278,180L281,185L281,190L283,193L287,192L288,190L291,191L296,192L296,192L296,192L296,191L299,189L299,186L304,184L304,186L307,189L309,186L311,187L312,191L315,192L324,191L327,187L327,187L327,187L320,182L318,181L324,178L330,179L331,177L329,171L330,169L335,166L338,170L339,174L344,172L344,168L342,163L340,163L339,157L337,155L340,150L339,148L343,145L343,144L339,139L335,139L327,142L325,142L320,139L318,140L313,139L311,137L309,137L306,134L303,135L300,134L299,135L296,134L290,134L289,131L286,132L278,125L275,122L276,121L272,119L271,121L268,121L265,124L255,119L248,108L248,107L245,104L243,101L247,98L247,92L247,87L249,84L248,81L244,82L244,78L242,74L243,70L246,69L249,59L244,59L242,56L248,54L237,49L233,47L232,47L227,44L222,43L216,44L201,44L201,45L187,46L183,47L182,50L177,55L172,55L170,57L164,53L159,55L156,56L150,57L149,58L146,60L138,59L138,60L138,60Z " data-fips="" data-iso3="TIB" data-name="Nàqu"/><path d="M89,172L91,168L90,167L96,165L100,159L105,168L108,170L110,167L110,163L104,159L102,155L106,154L108,152L107,148L108,147L107,145L114,143L124,147L128,147L130,146L133,146L137,147L136,144L138,143L141,147L141,151L137,151L134,153L139,155L140,159L142,163L135,171L137,172L140,181L140,186L141,186L147,193L154,191L156,189L158,189L162,183L161,181L163,176L160,173L163,172L162,171L170,165L170,165L170,165L169,160L163,158L159,153L154,150L153,148L151,148L152,141L151,138L153,135L156,129L159,127L161,127L169,125L173,122L172,118L172,114L169,110L168,110L165,105L160,101L157,96L157,97L152,95L149,94L144,91L143,87L146,82L148,79L143,75L144,73L140,71L137,68L137,65L138,63L138,60L138,60L131,59L123,56L122,53L118,50L115,49L110,50L110,52L105,53L104,56L97,57L94,57L92,54L88,54L85,52L84,54L79,52L75,49L71,50L71,53L65,59L64,61L61,62L59,69L54,69L50,69L45,68L37,75L36,79L37,82L35,86L36,89L41,97L46,98L45,101L46,105L46,112L37,116L35,116L32,112L32,107L29,109L27,108L25,110L26,113L25,114L27,118L27,120L29,123L27,128L29,132L27,133L29,141L30,139L34,137L36,145L41,149L44,149L49,153L51,155L53,157L52,159L62,166L63,168L67,171L69,176L71,175L71,173L75,171L74,170L79,167L86,171L88,172L89,172Z " data-fips="" data-iso3="TIB" data-name="Ali"/><path d="M327,187L327,187L324,191L315,192L312,191L311,187L309,186L307,189L304,186L304,184L299,186L299,189L296,191L296,192L296,192L296,192L292,196L291,198L287,198L287,200L289,202L291,201L293,205L293,205L293,205L294,206L297,205L300,205L302,205L305,210L303,216L302,216L295,226L301,228L302,227L307,227L312,229L312,229L312,229L313,229L313,229L313,229L314,229L315,229L315,229L315,229L316,229L316,229L317,229L317,229L318,229L318,229L318,229L322,228L323,225L328,219L335,215L336,214L339,217L344,219L345,219L350,221L352,221L354,217L365,212L367,215L370,219L366,221L369,223L374,221L373,223L375,228L369,235L371,237L374,236L377,235L383,238L385,237L390,240L396,235L400,238L402,237L404,241L407,243L409,240L408,237L411,239L412,243L415,241L418,239L418,235L418,235L415,233L413,228L406,222L406,220L401,220L398,217L394,216L392,220L391,212L385,210L385,207L383,206L380,208L375,207L373,204L375,201L377,196L375,196L372,191L371,190L368,193L367,194L362,193L361,191L358,188L358,187L349,184L342,186L338,185L336,186L331,186L331,185L327,187L327,187Z " data-fips="" data-iso3="TIB" data-name="Línzhi"/><path d="M313,229L314,229L315,229L315,229L315,229L315,229L314,229L313,229L313,229Z M317,229L318,229L318,229L318,229L317,229L317,229Z M293,205L292,205L284,208L283,207L279,207L276,207L266,207L261,211L257,211L252,213L250,211L250,211L249,211L245,221L245,223L243,227L244,228L244,234L244,234L254,237L250,240L256,240L256,241L262,243L268,240L278,248L278,249L286,247L289,248L296,245L295,242L307,236L306,234L312,229L312,229L307,227L302,227L301,228L295,226L302,216L303,216L305,210L302,205L300,205L297,205L294,206L293,205L293,205Z " data-fips="" data-iso3="TIB" data-name="Shannán"/><path d="M89,172L89,175L89,178L92,179L97,183L97,184L101,188L109,192L109,194L114,202L116,202L121,199L122,199L127,210L130,211L131,215L135,217L140,218L145,218L143,222L145,226L150,226L152,227L155,225L155,228L157,230L158,236L159,236L164,231L164,234L168,237L171,234L175,234L176,235L182,240L184,241L191,240L192,242L197,240L202,241L204,239L211,238L213,237L217,239L218,243L215,249L219,256L219,251L228,243L227,241L230,240L233,237L237,237L239,234L244,234L244,234L244,228L243,227L245,223L245,221L249,211L250,211L249,211L238,208L238,206L240,205L241,203L238,198L244,196L244,196L244,196L242,195L239,190L238,189L231,188L230,187L218,188L214,191L213,188L210,187L206,184L201,183L199,184L195,181L194,178L190,178L188,176L188,169L185,171L184,169L182,169L180,171L183,177L179,179L178,178L177,180L174,176L173,170L172,167L170,165L170,165L170,165L162,171L163,172L160,173L163,176L161,181L162,183L158,189L156,189L154,191L147,193L141,186L140,186L140,181L137,172L135,171L142,163L140,159L139,155L134,153L137,151L141,151L141,147L138,143L136,144L137,147L133,146L130,146L128,147L124,147L114,143L107,145L108,147L107,148L108,152L106,154L102,155L104,159L110,163L110,167L108,170L105,168L100,159L96,165L90,167L91,168L89,172L89,172Z " data-fips="" data-iso3="TIB" data-name="Rìkazé"/></g></svg>
\ No newline at end of file

tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml

@@ -2245,13 +2245,13 @@
 		<events>1</events>
 		<continent>Asia</continent>
 		<continentCode>asi</continentCode>
-		<country>Tibet</country>
-		<countryCode>ti</countryCode>
-		<countryFlag>plugins/Morpheus/icons/dist/flags/ti.png</countryFlag>
-		<region>Unknown</region>
-		<regionCode>1</regionCode>
+		<country>China</country>
+		<countryCode>cn</countryCode>
+		<countryFlag>plugins/Morpheus/icons/dist/flags/cn.png</countryFlag>
+		<region>Xizang</region>
+		<regionCode>14</regionCode>
 		<city>Lhasa</city>
-		<location>Lhasa, Unknown, Tibet</location>
+		<location>Lhasa, Xizang, China</location>
 		<latitude>29.650000</latitude>
 		<longitude>91.100000</longitude>
 		<visitLocalTime>12:34:06</visitLocalTime>
@@ -2525,13 +2525,13 @@
 		<events>0</events>
 		<continent>Asia</continent>
 		<continentCode>asi</continentCode>
-		<country>Tibet</country>
-		<countryCode>ti</countryCode>
-		<countryFlag>plugins/Morpheus/icons/dist/flags/ti.png</countryFlag>
-		<region>Unknown</region>
-		<regionCode>1</regionCode>
+		<country>China</country>
+		<countryCode>cn</countryCode>
+		<countryFlag>plugins/Morpheus/icons/dist/flags/cn.png</countryFlag>
+		<region>Xizang</region>
+		<regionCode>14</regionCode>
 		<city>Lhasa</city>
-		<location>Lhasa, Unknown, Tibet</location>
+		<location>Lhasa, Xizang, China</location>
 		<latitude>29.650000</latitude>
 		<longitude>91.100000</longitude>
 		<visitLocalTime>12:34:06</visitLocalTime>

tests/PHPUnit/System/expected/test_AutoSuggestAPITest_countryCode__API.getSuggestedValuesForSegment.xml

@@ -7,7 +7,7 @@
 	<row>it</row>
 	<row>fr</row>
 	<row>id</row>
-	<row>ti</row>
+	<row>cn</row>
 	<row>mk</row>
 	<row>xx</row>
 </result>
\ No newline at end of file

tests/PHPUnit/System/expected/test_AutoSuggestAPITest_regionCode__API.getSuggestedValuesForSegment.xml

@@ -5,7 +5,7 @@
 	<row>P3</row>
 	<row>A6</row>
 	<row>H9</row>
-	<row>1</row>
+	<row>14</row>
 	<row>G5</row>
 	<row>CA</row>
 </result>
\ No newline at end of file

tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCity_month.xml

@@ -162,7 +162,7 @@
 		<logo>plugins/Morpheus/icons/dist/flags/ru.png</logo>
 	</row>
 	<row>
-		<label>Lhasa, Unknown, Tibet</label>
+		<label>Lhasa, Xizang, China</label>
 		<nb_visits>2</nb_visits>
 		<nb_actions>5</nb_actions>
 		<max_actions>4</max_actions>
@@ -186,13 +186,13 @@
 		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<lat>29.65</lat>
 		<long>91.1</long>
-		<segment>city==Lhasa;regionCode==1;countryCode==ti</segment>
+		<segment>city==Lhasa;regionCode==14;countryCode==cn</segment>
 		<city_name>Lhasa</city_name>
-		<region>1</region>
-		<country>ti</country>
-		<country_name>Tibet</country_name>
-		<region_name>Unknown</region_name>
-		<logo>plugins/Morpheus/icons/dist/flags/ti.png</logo>
+		<region>14</region>
+		<country>cn</country>
+		<country_name>China</country_name>
+		<region_name>Xizang</region_name>
+		<logo>plugins/Morpheus/icons/dist/flags/cn.png</logo>
 	</row>
 	<row>
 		<label>London, London, City of, United Kingdom</label>

tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCountry_month.xml

@@ -113,10 +113,10 @@
 		<logoHeight>16</logoHeight>
 	</row>
 	<row>
-		<label>France</label>
+		<label>China</label>
 		<nb_visits>2</nb_visits>
-		<nb_actions>6</nb_actions>
-		<max_actions>5</max_actions>
+		<nb_actions>5</nb_actions>
+		<max_actions>4</max_actions>
 		<sum_visit_length>1621</sum_visit_length>
 		<bounce_count>1</bounce_count>
 		<goals>
@@ -135,16 +135,16 @@
 		<revenue>15</revenue>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
-		<code>fr</code>
-		<logo>plugins/Morpheus/icons/dist/flags/fr.png</logo>
-		<segment>countryCode==fr</segment>
+		<code>cn</code>
+		<logo>plugins/Morpheus/icons/dist/flags/cn.png</logo>
+		<segment>countryCode==cn</segment>
 		<logoHeight>16</logoHeight>
 	</row>
 	<row>
-		<label>Indonesia</label>
+		<label>France</label>
 		<nb_visits>2</nb_visits>
-		<nb_actions>5</nb_actions>
-		<max_actions>4</max_actions>
+		<nb_actions>6</nb_actions>
+		<max_actions>5</max_actions>
 		<sum_visit_length>1621</sum_visit_length>
 		<bounce_count>1</bounce_count>
 		<goals>
@@ -163,16 +163,16 @@
 		<revenue>15</revenue>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
-		<code>id</code>
-		<logo>plugins/Morpheus/icons/dist/flags/id.png</logo>
-		<segment>countryCode==id</segment>
+		<code>fr</code>
+		<logo>plugins/Morpheus/icons/dist/flags/fr.png</logo>
+		<segment>countryCode==fr</segment>
 		<logoHeight>16</logoHeight>
 	</row>
 	<row>
-		<label>Italy</label>
+		<label>Indonesia</label>
 		<nb_visits>2</nb_visits>
-		<nb_actions>6</nb_actions>
-		<max_actions>5</max_actions>
+		<nb_actions>5</nb_actions>
+		<max_actions>4</max_actions>
 		<sum_visit_length>1621</sum_visit_length>
 		<bounce_count>1</bounce_count>
 		<goals>
@@ -191,16 +191,16 @@
 		<revenue>15</revenue>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
-		<code>it</code>
-		<logo>plugins/Morpheus/icons/dist/flags/it.png</logo>
-		<segment>countryCode==it</segment>
+		<code>id</code>
+		<logo>plugins/Morpheus/icons/dist/flags/id.png</logo>
+		<segment>countryCode==id</segment>
 		<logoHeight>16</logoHeight>
 	</row>
 	<row>
-		<label>Macedonia</label>
+		<label>Italy</label>
 		<nb_visits>2</nb_visits>
-		<nb_actions>5</nb_actions>
-		<max_actions>4</max_actions>
+		<nb_actions>6</nb_actions>
+		<max_actions>5</max_actions>
 		<sum_visit_length>1621</sum_visit_length>
 		<bounce_count>1</bounce_count>
 		<goals>
@@ -219,13 +219,13 @@
 		<revenue>15</revenue>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
-		<code>mk</code>
-		<logo>plugins/Morpheus/icons/dist/flags/mk.png</logo>
-		<segment>countryCode==mk</segment>
+		<code>it</code>
+		<logo>plugins/Morpheus/icons/dist/flags/it.png</logo>
+		<segment>countryCode==it</segment>
 		<logoHeight>16</logoHeight>
 	</row>
 	<row>
-		<label>Tibet</label>
+		<label>Macedonia</label>
 		<nb_visits>2</nb_visits>
 		<nb_actions>5</nb_actions>
 		<max_actions>4</max_actions>
@@ -247,9 +247,9 @@
 		<revenue>15</revenue>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
-		<code>ti</code>
-		<logo>plugins/Morpheus/icons/dist/flags/ti.png</logo>
-		<segment>countryCode==ti</segment>
+		<code>mk</code>
+		<logo>plugins/Morpheus/icons/dist/flags/mk.png</logo>
+		<segment>countryCode==mk</segment>
 		<logoHeight>16</logoHeight>
 	</row>
 	<row>

tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getRegion_month.xml

@@ -240,7 +240,7 @@
 		<logo>plugins/Morpheus/icons/dist/flags/mk.png</logo>
 	</row>
 	<row>
-		<label>Unknown, Tibet</label>
+		<label>Xizang, China</label>
 		<nb_visits>2</nb_visits>
 		<nb_actions>5</nb_actions>
 		<max_actions>4</max_actions>
@@ -262,12 +262,12 @@
 		<revenue>15</revenue>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
-		<segment>regionCode==1;countryCode==ti</segment>
-		<region>1</region>
-		<country>ti</country>
-		<country_name>Tibet</country_name>
-		<region_name>Unknown</region_name>
-		<logo>plugins/Morpheus/icons/dist/flags/ti.png</logo>
+		<segment>regionCode==14;countryCode==cn</segment>
+		<region>14</region>
+		<country>cn</country>
+		<country_name>China</country_name>
+		<region_name>Xizang</region_name>
+		<logo>plugins/Morpheus/icons/dist/flags/cn.png</logo>
 	</row>
 	<row>
 		<label>California, United States</label>