diff --git a/plugins/UserCountry/Columns/Latitude.php b/plugins/UserCountry/Columns/Latitude.php index d768af53f915cc81da68480b406ae0c2b1e1b5cf..4cb29bf71960a03dff2cef91c72980854c824b61 100644 --- a/plugins/UserCountry/Columns/Latitude.php +++ b/plugins/UserCountry/Columns/Latitude.php @@ -18,7 +18,7 @@ use Piwik\Tracker\Action; class Latitude extends Base { protected $columnName = 'location_latitude'; - protected $columnType = 'float(10, 6) DEFAULT NULL'; + protected $columnType = 'decimal(9, 6) DEFAULT NULL'; protected function configureSegments() { diff --git a/plugins/UserCountry/Columns/Longitude.php b/plugins/UserCountry/Columns/Longitude.php index e937193dd6b53c4875428a422211f8ea80f15990..d54a66ce6adb48ac91036808e2c3d6197b1436de 100644 --- a/plugins/UserCountry/Columns/Longitude.php +++ b/plugins/UserCountry/Columns/Longitude.php @@ -18,7 +18,7 @@ use Piwik\Tracker\Action; class Longitude extends Base { protected $columnName = 'location_longitude'; - protected $columnType = 'float(10, 6) DEFAULT NULL'; + protected $columnType = 'decimal(9, 6) DEFAULT NULL'; protected function configureSegments() { diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_longitude__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_longitude__VisitsSummary.get_range.xml index d8bcdace18e8112b2726ba46257b048d489879f9..789c2c6fd12a2f67b894fc52d0f1dc5d69fbc97a 100644 --- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_longitude__VisitsSummary.get_range.xml +++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_longitude__VisitsSummary.get_range.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="utf-8" ?> <result> - <nb_visits>0</nb_visits> - <nb_actions>0</nb_actions> - <nb_visits_converted>0</nb_visits_converted> - <bounce_count>0</bounce_count> - <sum_visit_length>0</sum_visit_length> - <max_actions>0</max_actions> - <bounce_rate>0%</bounce_rate> - <nb_actions_per_visit>0</nb_actions_per_visit> - <avg_time_on_site>0</avg_time_on_site> + <nb_visits>6</nb_visits> + <nb_actions>16</nb_actions> + <nb_visits_converted>6</nb_visits_converted> + <bounce_count>3</bounce_count> + <sum_visit_length>4863</sum_visit_length> + <max_actions>5</max_actions> + <bounce_rate>50%</bounce_rate> + <nb_actions_per_visit>2.7</nb_actions_per_visit> + <avg_time_on_site>811</avg_time_on_site> </result> \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml index 2087b56cee09f0565215fc9add35ab883447f297..d4fde8bad536ffd857095bb36f9b88731193769d 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml @@ -93,7 +93,7 @@ <regionCode>NC</regionCode> <city>Raleigh</city> <location>Raleigh, North Carolina, United States</location> - <latitude>35.771999</latitude> + <latitude>35.772000</latitude> <longitude>-78.639000</longitude> <visitLocalTime>20:34:49</visitLocalTime> <visitLocalHour>20</visitLocalHour> @@ -237,7 +237,7 @@ <city>Lake Forest</city> <location>Lake Forest, California, United States</location> <latitude>33.645000</latitude> - <longitude>-117.679001</longitude> + <longitude>-117.679000</longitude> <visitLocalTime>17:33:27</visitLocalTime> <visitLocalHour>17</visitLocalHour> <daysSinceLastVisit>181</daysSinceLastVisit> @@ -622,7 +622,7 @@ <regionCode>05</regionCode> <city>Maaseik</city> <location>Maaseik, Limburg, Belgium</location> - <latitude>51.099998</latitude> + <latitude>51.100000</latitude> <longitude>5.800000</longitude> <visitLocalTime>01:34:24</visitLocalTime> <visitLocalHour>1</visitLocalHour> @@ -753,7 +753,7 @@ <city>San Francisco</city> <location>San Francisco, California, United States</location> <latitude>37.792000</latitude> - <longitude>-122.408997</longitude> + <longitude>-122.409000</longitude> <visitLocalTime>17:33:58</visitLocalTime> <visitLocalHour>17</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> @@ -889,8 +889,8 @@ <regionCode>19</regionCode> <city>Nihon'odori</city> <location>Nihon'odori, Kanagawa, Japan</location> - <latitude>35.450001</latitude> - <longitude>139.649994</longitude> + <latitude>35.450000</latitude> + <longitude>139.650000</longitude> <visitLocalTime>09:33:50</visitLocalTime> <visitLocalHour>9</visitLocalHour> <daysSinceLastVisit>1</daysSinceLastVisit> @@ -1015,7 +1015,7 @@ <regionCode>07</regionCode> <city>Weilerswist</city> <location>Weilerswist, Nordrhein-Westfalen, Germany</location> - <latitude>50.766998</latitude> + <latitude>50.767000</latitude> <longitude>6.833000</longitude> <visitLocalTime>01:33:31</visitLocalTime> <visitLocalHour>1</visitLocalHour> @@ -1308,8 +1308,8 @@ <regionCode>48</regionCode> <city>Moscow</city> <location>Moscow, Moscow City, Russia</location> - <latitude>55.751999</latitude> - <longitude>37.616001</longitude> + <latitude>55.752000</latitude> + <longitude>37.616000</longitude> <visitLocalTime>04:28:18</visitLocalTime> <visitLocalHour>4</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> @@ -1431,7 +1431,7 @@ <city>Esentepe</city> <location>Esentepe, Rize, Turkey</location> <latitude>40.979000</latitude> - <longitude>40.415001</longitude> + <longitude>40.415000</longitude> <visitLocalTime>02:32:21</visitLocalTime> <visitLocalHour>2</visitLocalHour> <daysSinceLastVisit>8</daysSinceLastVisit> @@ -1560,7 +1560,7 @@ <regionCode>05</regionCode> <city>Maaseik</city> <location>Maaseik, Limburg, Belgium</location> - <latitude>51.099998</latitude> + <latitude>51.100000</latitude> <longitude>5.800000</longitude> <visitLocalTime>01:34:18</visitLocalTime> <visitLocalHour>1</visitLocalHour> @@ -3115,8 +3115,8 @@ <regionCode>NU</regionCode> <city>Igloolik</city> <location>Igloolik, Nunavut, Canada</location> - <latitude>69.400002</latitude> - <longitude>-81.800003</longitude> + <latitude>69.400000</latitude> + <longitude>-81.800000</longitude> <visitLocalTime>12:20:31</visitLocalTime> <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> @@ -3224,7 +3224,7 @@ <regionCode>NJ</regionCode> <city>Mount Laurel</city> <location>Mount Laurel, New Jersey, United States</location> - <latitude>39.957001</latitude> + <latitude>39.957000</latitude> <longitude>-74.916000</longitude> <visitLocalTime>12:20:31</visitLocalTime> <visitLocalHour>12</visitLocalHour> @@ -3641,8 +3641,8 @@ <regionCode>11</regionCode> <city>Seoul</city> <location>Seoul, Seoul-t'ukpyolsi, South Korea</location> - <latitude>37.598999</latitude> - <longitude>126.977997</longitude> + <latitude>37.599000</latitude> + <longitude>126.978000</longitude> <visitLocalTime>20:15:41</visitLocalTime> <visitLocalHour>20</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> @@ -4020,8 +4020,8 @@ <regionCode>VA</regionCode> <city>Ashburn</city> <location>Ashburn, Virginia, United States</location> - <latitude>39.043999</latitude> - <longitude>-77.487999</longitude> + <latitude>39.044000</latitude> + <longitude>-77.488000</longitude> <visitLocalTime>17:48:08</visitLocalTime> <visitLocalHour>17</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> @@ -4132,8 +4132,8 @@ <regionCode>VA</regionCode> <city>Ashburn</city> <location>Ashburn, Virginia, United States</location> - <latitude>39.043999</latitude> - <longitude>-77.487999</longitude> + <latitude>39.044000</latitude> + <longitude>-77.488000</longitude> <visitLocalTime>17:48:07</visitLocalTime> <visitLocalHour>17</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> @@ -5649,8 +5649,8 @@ <regionCode>VA</regionCode> <city>Ashburn</city> <location>Ashburn, Virginia, United States</location> - <latitude>39.043999</latitude> - <longitude>-77.487999</longitude> + <latitude>39.044000</latitude> + <longitude>-77.488000</longitude> <visitLocalTime>13:49:48</visitLocalTime> <visitLocalHour>13</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> @@ -5757,8 +5757,8 @@ <regionCode>VA</regionCode> <city>Ashburn</city> <location>Ashburn, Virginia, United States</location> - <latitude>39.043999</latitude> - <longitude>-77.487999</longitude> + <latitude>39.044000</latitude> + <longitude>-77.488000</longitude> <visitLocalTime>13:48:20</visitLocalTime> <visitLocalHour>13</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> @@ -5865,8 +5865,8 @@ <regionCode>VA</regionCode> <city>Ashburn</city> <location>Ashburn, Virginia, United States</location> - <latitude>39.043999</latitude> - <longitude>-77.487999</longitude> + <latitude>39.044000</latitude> + <longitude>-77.488000</longitude> <visitLocalTime>13:48:07</visitLocalTime> <visitLocalHour>13</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__Live.getLastVisitsDetails_range.xml index 2ae237fb14f3f2311eb4831835e0d2c26deef1b1..9d638427bf7d5c71d79a3be0ee6d09dd3dbe69bb 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__Live.getLastVisitsDetails_range.xml @@ -82,7 +82,7 @@ <regionCode>NC</regionCode> <city>Raleigh</city> <location>Raleigh, North Carolina, United States</location> - <latitude>35.771999</latitude> + <latitude>35.772000</latitude> <longitude>-78.639000</longitude> <visitLocalTime>20:34:49</visitLocalTime> <visitLocalHour>20</visitLocalHour> @@ -215,7 +215,7 @@ <city>Lake Forest</city> <location>Lake Forest, California, United States</location> <latitude>33.645000</latitude> - <longitude>-117.679001</longitude> + <longitude>-117.679000</longitude> <visitLocalTime>17:33:27</visitLocalTime> <visitLocalHour>17</visitLocalHour> <daysSinceLastVisit>181</daysSinceLastVisit> @@ -578,7 +578,7 @@ <regionCode>05</regionCode> <city>Maaseik</city> <location>Maaseik, Limburg, Belgium</location> - <latitude>51.099998</latitude> + <latitude>51.100000</latitude> <longitude>5.800000</longitude> <visitLocalTime>01:34:24</visitLocalTime> <visitLocalHour>1</visitLocalHour> @@ -698,7 +698,7 @@ <city>San Francisco</city> <location>San Francisco, California, United States</location> <latitude>37.792000</latitude> - <longitude>-122.408997</longitude> + <longitude>-122.409000</longitude> <visitLocalTime>17:33:58</visitLocalTime> <visitLocalHour>17</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> @@ -823,8 +823,8 @@ <regionCode>19</regionCode> <city>Nihon'odori</city> <location>Nihon'odori, Kanagawa, Japan</location> - <latitude>35.450001</latitude> - <longitude>139.649994</longitude> + <latitude>35.450000</latitude> + <longitude>139.650000</longitude> <visitLocalTime>09:33:50</visitLocalTime> <visitLocalHour>9</visitLocalHour> <daysSinceLastVisit>1</daysSinceLastVisit> @@ -938,7 +938,7 @@ <regionCode>07</regionCode> <city>Weilerswist</city> <location>Weilerswist, Nordrhein-Westfalen, Germany</location> - <latitude>50.766998</latitude> + <latitude>50.767000</latitude> <longitude>6.833000</longitude> <visitLocalTime>01:33:31</visitLocalTime> <visitLocalHour>1</visitLocalHour> @@ -1209,8 +1209,8 @@ <regionCode>48</regionCode> <city>Moscow</city> <location>Moscow, Moscow City, Russia</location> - <latitude>55.751999</latitude> - <longitude>37.616001</longitude> + <latitude>55.752000</latitude> + <longitude>37.616000</longitude> <visitLocalTime>04:28:18</visitLocalTime> <visitLocalHour>4</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> @@ -1321,7 +1321,7 @@ <city>Esentepe</city> <location>Esentepe, Rize, Turkey</location> <latitude>40.979000</latitude> - <longitude>40.415001</longitude> + <longitude>40.415000</longitude> <visitLocalTime>02:32:21</visitLocalTime> <visitLocalHour>2</visitLocalHour> <daysSinceLastVisit>8</daysSinceLastVisit> @@ -1439,7 +1439,7 @@ <regionCode>05</regionCode> <city>Maaseik</city> <location>Maaseik, Limburg, Belgium</location> - <latitude>51.099998</latitude> + <latitude>51.100000</latitude> <longitude>5.800000</longitude> <visitLocalTime>01:34:18</visitLocalTime> <visitLocalHour>1</visitLocalHour>