From badeca8f750a710348af717320121526605eb158 Mon Sep 17 00:00:00 2001 From: kiang Date: Sat, 31 Oct 2015 02:38:11 +0800 Subject: [PATCH] remove points with distance 1.5km in one hour --- tracks/json/2015/201542.json | 284 +++-------- tracks/json/2015/201543.json | 157 +----- tracks/json/2015/201544.json | 895 +++++++---------------------------- tracks/query.php | 19 +- 4 files changed, 267 insertions(+), 1088 deletions(-) diff --git a/tracks/json/2015/201542.json b/tracks/json/2015/201542.json index 5ea4fe04..05591097 100644 --- a/tracks/json/2015/201542.json +++ b/tracks/json/2015/201542.json @@ -385,7 +385,7 @@ "properties": { "device": "AndroidDevice_867159020029530", "timeBegin": "2015-10-16 08:00:27", - "timeEnd": "2015-10-16 16:01:53" + "timeEnd": "2015-10-16 09:42:24" }, "geometry": { "type": "LineString", @@ -434,14 +434,6 @@ 120.2327562, 22.97866 ], - [ - 120.234786, - 22.9642611 - ], - [ - 120.2370859, - 22.9615926 - ], [ 120.2376528, 22.9773377 @@ -461,99 +453,37 @@ [ 120.2254013, 22.9981891 - ], - [ - 120.2065995, - 23.0053408 - ], - [ - 120.2050311, - 23.0271197 - ], - [ - 120.2050238, - 23.0283998 - ], - [ - 120.2043688, - 23.0318627 - ], - [ - 120.2027155, - 23.0386081 - ], - [ - 120.2027396, - 23.0386958 - ], - [ - 120.1970068, - 23.0418145 - ], - [ - 120.1958471, - 23.0430188 - ], - [ - 120.1844527, - 23.0470788 - ], - [ - 120.1685586, - 23.0470917 - ], - [ - 120.1711543, - 23.0491783 - ], - [ - 120.1461238, - 23.0593585 - ], + ] + ] + } + }, + { + "type": "Feature", + "properties": { + "device": "AndroidDevice_867159020029530", + "timeBegin": "2015-10-16 10:45:57", + "timeEnd": "2015-10-16 10:45:57" + }, + "geometry": { + "type": "LineString", + "coordinates": [ [ 120.1317743, 23.0569046 - ], - [ - 120.1868027, - 22.9933153 - ], - [ - 120.1925529, - 22.9954485 - ], - [ - 120.1936264, - 22.9948831 - ], - [ - 120.2005563, - 22.994082 - ], - [ - 120.2289429, - 22.9898793 - ], - [ - 120.2293642, - 22.987031 - ], - [ - 120.2296889, - 22.9872266 - ], - [ - 120.2296486, - 22.987823 - ], - [ - 120.2296589, - 22.9872073 - ], - [ - 120.2300771, - 22.9874419 - ], + ] + ] + } + }, + { + "type": "Feature", + "properties": { + "device": "AndroidDevice_867159020029530", + "timeBegin": "2015-10-16 11:49:51", + "timeEnd": "2015-10-16 13:29:49" + }, + "geometry": { + "type": "LineString", + "coordinates": [ [ 120.2292592, 22.9871345 @@ -645,39 +575,20 @@ [ 120.233785, 23.0075397 - ], - [ - 120.2166526, - 23.0236346 - ], - [ - 120.2159869, - 23.0235299 - ], - [ - 120.1850933, - 23.0117053 - ], - [ - 120.1866524, - 22.9987355 - ], - [ - 120.1838824, - 22.9688449 - ], - [ - 120.1761506, - 22.9442215 - ], - [ - 120.1818856, - 22.9349405 - ], - [ - 120.1938194, - 22.9385439 - ], + ] + ] + } + }, + { + "type": "Feature", + "properties": { + "device": "AndroidDevice_867159020029530", + "timeBegin": "2015-10-16 14:29:50", + "timeEnd": "2015-10-16 15:26:06" + }, + "geometry": { + "type": "LineString", + "coordinates": [ [ 120.1828426, 22.9284534 @@ -686,29 +597,9 @@ 120.1846367, 22.9285992 ], - [ - 120.1841611, - 22.962349 - ], [ 120.1859453, 22.9293156 - ], - [ - 120.1437204, - 22.995678 - ], - [ - 120.1439071, - 22.9958315 - ], - [ - 120.1439192, - 22.9958464 - ], - [ - 120.1438783, - 22.9958095 ] ] } @@ -718,7 +609,7 @@ "properties": { "device": "AndroidDevice_867159020029530", "timeBegin": "2015-10-18 08:00:50", - "timeEnd": "2015-10-18 11:28:00" + "timeEnd": "2015-10-18 08:00:50" }, "geometry": { "type": "LineString", @@ -726,55 +617,20 @@ [ 120.1649786, 23.001731 - ], - [ - 120.18522, - 22.9976695 - ], - [ - 120.1949567, - 22.9936025 - ], - [ - 120.1998121, - 22.9840893 - ], - [ - 120.198762, - 22.9842481 - ], - [ - 120.1977042, - 22.9851901 - ], - [ - 120.1798782, - 22.9917725 - ], - [ - 120.1802578, - 22.9850194 - ], - [ - 120.1752518, - 22.9845513 - ], - [ - 120.1807782, - 22.9839343 - ], - [ - 120.1752518, - 22.9845513 - ], - [ - 120.1804524, - 22.9835003 - ], - [ - 120.179603, - 22.9835266 - ], + ] + ] + } + }, + { + "type": "Feature", + "properties": { + "device": "AndroidDevice_867159020029530", + "timeBegin": "2015-10-18 09:03:59", + "timeEnd": "2015-10-18 11:15:59" + }, + "geometry": { + "type": "LineString", + "coordinates": [ [ 120.1788393, 22.9831282 @@ -843,14 +699,6 @@ 120.1697056, 22.9984205 ], - [ - 120.1437174, - 22.9956775 - ], - [ - 120.1752518, - 22.9845513 - ], [ 120.160225, 23.002379 @@ -863,22 +711,6 @@ 120.1690427, 22.9949466 ], - [ - 120.212898, - 23.0109227 - ], - [ - 120.1752518, - 22.9845513 - ], - [ - 120.1437177, - 22.9956778 - ], - [ - 120.1439502, - 22.9958627 - ], [ 120.1752518, 22.9845513 diff --git a/tracks/json/2015/201543.json b/tracks/json/2015/201543.json index fb5845b4..a114857e 100644 --- a/tracks/json/2015/201543.json +++ b/tracks/json/2015/201543.json @@ -583,7 +583,7 @@ "properties": { "device": "AndroidDevice_867159020018780", "timeBegin": "2015-10-22 13:47:43", - "timeEnd": "2015-10-22 17:30:46" + "timeEnd": "2015-10-22 16:23:42" }, "geometry": { "type": "LineString", @@ -735,63 +735,20 @@ [ 120.1648711, 23.0017282 - ], - [ - 120.1438555, - 22.9957944 - ], - [ - 120.1437855, - 22.9957462 - ], - [ - 120.1438805, - 22.9958112 - ], - [ - 120.1439211, - 22.9958438 - ], - [ - 120.1439133, - 22.9958352 - ], - [ - 120.143902, - 22.9958302 - ], - [ - 120.1438803, - 22.9958133 - ], - [ - 120.1438559, - 22.9957962 - ], - [ - 120.1438592, - 22.995795 - ], - [ - 120.1438817, - 22.9958126 - ], - [ - 120.1439157, - 22.9958405 - ], - [ - 120.1438803, - 22.9958133 - ], - [ - 120.1439473, - 22.9958689 - ], - [ - 120.1439633, - 22.9958778 - ], + ] + ] + } + }, + { + "type": "Feature", + "properties": { + "device": "AndroidDevice_867159020018780", + "timeBegin": "2015-10-22 17:23:50", + "timeEnd": "2015-10-22 17:30:46" + }, + "geometry": { + "type": "LineString", + "coordinates": [ [ 120.1438783, 22.9958095 @@ -1568,7 +1525,7 @@ "properties": { "device": "AndroidDevice_867159020023111", "timeBegin": "2015-10-21 14:06:26", - "timeEnd": "2015-10-21 16:25:17" + "timeEnd": "2015-10-21 16:10:41" }, "geometry": { "type": "LineString", @@ -1684,14 +1641,6 @@ [ 120.1898996, 23.0189531 - ], - [ - 120.2074473, - 22.9980805 - ], - [ - 120.1610622, - 23.0408416 ] ] } @@ -1879,7 +1828,7 @@ "properties": { "device": "AndroidDevice_867159020039984", "timeBegin": "2015-10-21 09:49:00", - "timeEnd": "2015-10-21 10:44:47" + "timeEnd": "2015-10-21 10:27:06" }, "geometry": { "type": "LineString", @@ -1931,14 +1880,6 @@ [ 120.1719736, 23.0017104 - ], - [ - 120.1478132, - 22.997955 - ], - [ - 120.1437177, - 22.9956772 ] ] } @@ -1948,7 +1889,7 @@ "properties": { "device": "AndroidDevice_867159020039984", "timeBegin": "2015-10-21 14:08:37", - "timeEnd": "2015-10-21 17:08:43" + "timeEnd": "2015-10-21 16:30:40" }, "geometry": { "type": "LineString", @@ -1957,10 +1898,6 @@ 120.2116698, 22.9927584 ], - [ - 120.2574395, - 22.971424 - ], [ 120.2103872, 22.9923145 @@ -2072,34 +2009,6 @@ [ 120.1999299, 23.0070317 - ], - [ - 120.1820907, - 23.0053487 - ], - [ - 120.1481036, - 22.998316 - ], - [ - 120.1437178, - 22.9956773 - ], - [ - 120.1439255, - 22.9958456 - ], - [ - 120.1437178, - 22.9956776 - ], - [ - 120.1438911, - 22.9958235 - ], - [ - 120.1438465, - 22.9957842 ] ] } @@ -2170,7 +2079,7 @@ "properties": { "device": "AndroidDevice_867159020039984", "timeBegin": "2015-10-25 13:45:53", - "timeEnd": "2015-10-25 15:02:14" + "timeEnd": "2015-10-25 14:14:32" }, "geometry": { "type": "LineString", @@ -2210,34 +2119,6 @@ [ 120.1932258, 22.9910191 - ], - [ - 120.1745349, - 22.9936478 - ], - [ - 120.1745239, - 22.9936445 - ], - [ - 120.1745845, - 22.993848 - ], - [ - 120.1746781, - 22.9933141 - ], - [ - 120.1747016, - 22.9932243 - ], - [ - 120.1745995, - 22.9931859 - ], - [ - 120.1744947, - 22.9931725 ] ] } diff --git a/tracks/json/2015/201544.json b/tracks/json/2015/201544.json index 5bb13552..d8028b01 100644 --- a/tracks/json/2015/201544.json +++ b/tracks/json/2015/201544.json @@ -35,30 +35,6 @@ 120.1938077, 23.0134749 ], - [ - 120.1794448, - 23.0087655 - ], - [ - 120.1792245, - 23.008173 - ], - [ - 120.1794001, - 23.0080586 - ], - [ - 120.1798635, - 23.0076883 - ], - [ - 120.1789547, - 23.0086799 - ], - [ - 120.1787588, - 23.0084708 - ], [ 120.1859955, 23.0102474 @@ -931,7 +907,7 @@ "properties": { "device": "AndroidDevice_867159020029456", "timeBegin": "2015-10-29 13:23:15", - "timeEnd": "2015-10-29 15:19:36" + "timeEnd": "2015-10-29 14:42:28" }, "geometry": { "type": "LineString", @@ -1003,34 +979,6 @@ [ 120.2085579, 23.0112834 - ], - [ - 120.1806801, - 23.0078933 - ], - [ - 120.1803643, - 23.0078909 - ], - [ - 120.1804528, - 23.0079402 - ], - [ - 120.1810093, - 23.0079261 - ], - [ - 120.1812793, - 23.0078849 - ], - [ - 120.1810241, - 23.0082088 - ], - [ - 120.1805559, - 23.007874 ] ] } @@ -1121,7 +1069,7 @@ "properties": { "device": "AndroidDevice_867159020030710", "timeBegin": "2015-10-29 08:22:07", - "timeEnd": "2015-10-29 10:43:02" + "timeEnd": "2015-10-29 10:31:43" }, "geometry": { "type": "LineString", @@ -1257,18 +1205,6 @@ [ 120.1908466, 22.9731456 - ], - [ - 120.192855, - 22.9590802 - ], - [ - 120.1954276, - 22.9585982 - ], - [ - 120.195546, - 22.9488258 ] ] } @@ -1278,7 +1214,7 @@ "properties": { "device": "AndroidDevice_867159020030710", "timeBegin": "2015-10-29 13:43:33", - "timeEnd": "2015-10-29 15:41:21" + "timeEnd": "2015-10-29 14:12:56" }, "geometry": { "type": "LineString", @@ -1318,47 +1254,20 @@ [ 120.1837771, 22.9307124 - ], - [ - 120.1830815, - 22.9457179 - ], - [ - 120.1894746, - 22.9623701 - ], - [ - 120.1913045, - 22.975164 - ], - [ - 120.1912811, - 22.9752618 - ], - [ - 120.1884165, - 22.9820088 - ], - [ - 120.1888493, - 22.9820258 - ], - [ - 120.1901432, - 22.9817885 - ], - [ - 120.1901588, - 22.981796 - ], - [ - 120.1878619, - 22.9813227 - ], - [ - 120.1884434, - 22.9820421 - ], + ] + ] + } + }, + { + "type": "Feature", + "properties": { + "device": "AndroidDevice_867159020030710", + "timeBegin": "2015-10-29 15:15:48", + "timeEnd": "2015-10-29 15:41:21" + }, + "geometry": { + "type": "LineString", + "coordinates": [ [ 120.1886285, 22.9820437 @@ -1391,7 +1300,7 @@ "properties": { "device": "AndroidDevice_867159020030710", "timeBegin": "2015-10-30 08:24:03", - "timeEnd": "2015-10-30 10:24:42" + "timeEnd": "2015-10-30 08:54:42" }, "geometry": { "type": "LineString", @@ -1435,51 +1344,20 @@ [ 120.1933677, 22.9725871 - ], - [ - 120.2111872, - 22.9681954 - ], - [ - 120.2140733, - 22.9688464 - ], - [ - 120.2140727, - 22.9688588 - ], - [ - 120.2140566, - 22.9688613 - ], - [ - 120.2141042, - 22.9688147 - ], - [ - 120.2140774, - 22.9688457 - ], - [ - 120.2131876, - 22.9685638 - ], - [ - 120.2131777, - 22.9685597 - ], - [ - 120.2131109, - 22.9678669 - ], - [ - 120.2131143, - 22.9678865 - ], - [ - 120.2131661, - 22.9684425 - ], + ] + ] + } + }, + { + "type": "Feature", + "properties": { + "device": "AndroidDevice_867159020030710", + "timeBegin": "2015-10-30 09:58:41", + "timeEnd": "2015-10-30 10:06:41" + }, + "geometry": { + "type": "LineString", + "coordinates": [ [ 120.2132142, 22.968512 @@ -1491,18 +1369,6 @@ [ 120.2141042, 22.9688147 - ], - [ - 120.1979318, - 22.9752391 - ], - [ - 120.1980137, - 22.9752377 - ], - [ - 120.172837, - 22.9917095 ] ] } @@ -1512,7 +1378,7 @@ "properties": { "device": "AndroidDevice_867159020030710", "timeBegin": "2015-10-30 13:24:45", - "timeEnd": "2015-10-30 15:40:38" + "timeEnd": "2015-10-30 13:24:45" }, "geometry": { "type": "LineString", @@ -1520,51 +1386,20 @@ [ 120.1953545, 22.9396447 - ], - [ - 120.1954308, - 22.9672512 - ], - [ - 120.1939893, - 22.9775244 - ], - [ - 120.1929842, - 22.9777581 - ], - [ - 120.1929592, - 22.9776343 - ], - [ - 120.1930238, - 22.9780432 - ], - [ - 120.193152, - 22.9775967 - ], - [ - 120.1925972, - 22.9776508 - ], - [ - 120.1919618, - 22.9773571 - ], - [ - 120.1923951, - 22.9777197 - ], - [ - 120.1916704, - 22.9775498 - ], - [ - 120.192998, - 22.9777278 - ], + ] + ] + } + }, + { + "type": "Feature", + "properties": { + "device": "AndroidDevice_867159020030710", + "timeBegin": "2015-10-30 14:30:41", + "timeEnd": "2015-10-30 15:40:38" + }, + "geometry": { + "type": "LineString", + "coordinates": [ [ 120.1931005, 22.9777412 @@ -1909,7 +1744,7 @@ "properties": { "device": "AndroidDevice_867159020039158", "timeBegin": "2015-10-27 09:00:34", - "timeEnd": "2015-10-27 11:47:02" + "timeEnd": "2015-10-27 09:05:11" }, "geometry": { "type": "LineString", @@ -1941,27 +1776,20 @@ [ 120.2160481, 23.0107394 - ], - [ - 120.1896615, - 23.0109647 - ], - [ - 120.1896563, - 23.0122261 - ], - [ - 120.1898072, - 23.0110152 - ], - [ - 120.1897009, - 23.0122424 - ], - [ - 120.1936275, - 23.015219 - ], + ] + ] + } + }, + { + "type": "Feature", + "properties": { + "device": "AndroidDevice_867159020039158", + "timeBegin": "2015-10-27 10:08:50", + "timeEnd": "2015-10-27 11:47:02" + }, + "geometry": { + "type": "LineString", + "coordinates": [ [ 120.2060603, 23.0217326 @@ -2050,7 +1878,7 @@ "properties": { "device": "AndroidDevice_867159020039158", "timeBegin": "2015-10-27 12:51:58", - "timeEnd": "2015-10-27 16:26:24" + "timeEnd": "2015-10-27 16:08:48" }, "geometry": { "type": "LineString", @@ -2163,22 +1991,10 @@ 120.1919434, 23.0224756 ], - [ - 120.2176072, - 23.0167094 - ], - [ - 120.1609359, - 23.0409825 - ], [ 120.1847955, 23.0114242 ], - [ - 120.2176072, - 23.0167094 - ], [ 120.1933611, 23.0176604 @@ -2187,10 +2003,6 @@ 120.2024149, 23.0177058 ], - [ - 120.2176072, - 23.0167094 - ], [ 120.205564, 23.0182692 @@ -2222,18 +2034,6 @@ [ 120.2176072, 23.0167094 - ], - [ - 120.1908981, - 23.0133468 - ], - [ - 120.1898238, - 23.0142075 - ], - [ - 120.1611726, - 23.0406307 ] ] } @@ -2243,7 +2043,7 @@ "properties": { "device": "AndroidDevice_867159020039158", "timeBegin": "2015-10-28 08:00:01", - "timeEnd": "2015-10-28 11:21:12" + "timeEnd": "2015-10-28 08:00:01" }, "geometry": { "type": "LineString", @@ -2251,51 +2051,20 @@ [ 120.1856036, 23.0088552 - ], - [ - 120.2037877, - 23.0121326 - ], - [ - 120.2153171, - 23.0091102 - ], - [ - 120.2199039, - 23.0112716 - ], - [ - 120.2262668, - 23.0094454 - ], - [ - 120.2266386, - 23.0089698 - ], - [ - 120.2267658, - 23.0088461 - ], - [ - 120.2252912, - 23.0102177 - ], - [ - 120.225608, - 23.0097997 - ], - [ - 120.2255993, - 23.0107138 - ], - [ - 120.2251289, - 23.0104744 - ], - [ - 120.2247415, - 23.0105358 - ], + ] + ] + } + }, + { + "type": "Feature", + "properties": { + "device": "AndroidDevice_867159020039158", + "timeBegin": "2015-10-28 09:00:02", + "timeEnd": "2015-10-28 10:20:00" + }, + "geometry": { + "type": "LineString", + "coordinates": [ [ 120.2261076, 23.0108829 @@ -2379,51 +2148,20 @@ [ 120.1983323, 23.0040602 - ], - [ - 120.2021721, - 23.0180172 - ], - [ - 120.2020231, - 23.0182798 - ], - [ - 120.2050305, - 23.0183945 - ], - [ - 120.2162787, - 23.0110757 - ], - [ - 120.2164658, - 23.0128247 - ], - [ - 120.2138845, - 23.0133764 - ], - [ - 120.2136102, - 23.0132713 - ], - [ - 120.2061091, - 23.0216171 - ], - [ - 120.2060928, - 23.021617 - ], - [ - 120.206098, - 23.0215596 - ], - [ - 120.2060806, - 23.0216436 - ], + ] + ] + } + }, + { + "type": "Feature", + "properties": { + "device": "AndroidDevice_867159020039158", + "timeBegin": "2015-10-28 11:20:43", + "timeEnd": "2015-10-28 11:21:12" + }, + "geometry": { + "type": "LineString", + "coordinates": [ [ 120.2060779, 23.0216609 @@ -2440,7 +2178,7 @@ "properties": { "device": "AndroidDevice_867159020039158", "timeBegin": "2015-10-28 13:03:36", - "timeEnd": "2015-10-28 16:51:57" + "timeEnd": "2015-10-28 13:13:19" }, "geometry": { "type": "LineString", @@ -2468,35 +2206,20 @@ [ 120.2094921, 23.0170956 - ], - [ - 120.2063525, - 23.002491 - ], - [ - 120.206814, - 23.0014618 - ], - [ - 120.2063517, - 23.0024912 - ], - [ - 120.20643, - 23.0025324 - ], - [ - 120.2063028, - 23.0029486 - ], - [ - 120.2063527, - 23.0024913 - ], - [ - 120.2055901, - 23.0018179 - ], + ] + ] + } + }, + { + "type": "Feature", + "properties": { + "device": "AndroidDevice_867159020039158", + "timeBegin": "2015-10-28 14:23:19", + "timeEnd": "2015-10-28 16:44:01" + }, + "geometry": { + "type": "LineString", + "coordinates": [ [ 120.2065408, 23.0026237 @@ -2549,10 +2272,6 @@ 120.2144222, 23.0130184 ], - [ - 120.4863043, - 23.1742512 - ], [ 120.2143774, 23.0115961 @@ -2569,10 +2288,6 @@ 120.2150972, 23.0129639 ], - [ - 120.4863035, - 23.1742495 - ], [ 120.2145437, 23.0114788 @@ -2588,10 +2303,6 @@ [ 120.2109123, 23.0164015 - ], - [ - 120.1587466, - 23.0398748 ] ] } @@ -2601,7 +2312,7 @@ "properties": { "device": "AndroidDevice_867159020039158", "timeBegin": "2015-10-29 08:00:05", - "timeEnd": "2015-10-29 11:47:31" + "timeEnd": "2015-10-29 08:00:05" }, "geometry": { "type": "LineString", @@ -2609,99 +2320,20 @@ [ 120.161097, 23.0407501 - ], - [ - 120.2033726, - 23.0120095 - ], - [ - 120.2122268, - 23.0101691 - ], - [ - 120.1942683, - 23.0097654 - ], - [ - 120.1860521, - 23.0087882 - ], - [ - 120.1857106, - 23.0086612 - ], - [ - 120.1954468, - 23.0121247 - ], - [ - 120.20207, - 23.0182039 - ], - [ - 120.2055671, - 23.0165338 - ], - [ - 120.2059593, - 23.0163904 - ], - [ - 120.2062668, - 23.0161782 - ], - [ - 120.2066153, - 23.0163307 - ], - [ - 120.2069509, - 23.0160028 - ], - [ - 120.2068293, - 23.0159118 - ], - [ - 120.206749, - 23.0161474 - ], - [ - 120.2066817, - 23.0162456 - ], - [ - 120.2061576, - 23.0163283 - ], - [ - 120.2059571, - 23.0163377 - ], - [ - 120.2057681, - 23.0166343 - ], - [ - 120.2058419, - 23.0168255 - ], - [ - 120.2057678, - 23.0167117 - ], - [ - 120.2056178, - 23.016827 - ], - [ - 120.2057612, - 23.0167849 - ], - [ - 120.2058432, - 23.0168255 - ], + ] + ] + } + }, + { + "type": "Feature", + "properties": { + "device": "AndroidDevice_867159020039158", + "timeBegin": "2015-10-29 09:07:13", + "timeEnd": "2015-10-29 11:47:31" + }, + "geometry": { + "type": "LineString", + "coordinates": [ [ 120.2053912, 23.01684 @@ -2742,10 +2374,6 @@ 120.2006262, 23.017494 ], - [ - 120.1856125, - 23.0088564 - ], [ 120.2013695, 23.0170167 @@ -2802,10 +2430,6 @@ 120.2065915, 23.0202294 ], - [ - 120.2152086, - 23.008968 - ], [ 120.2077205, 23.0157916 @@ -3426,7 +3050,7 @@ "properties": { "device": "AndroidDevice_867159020020208", "timeBegin": "2015-10-30 08:19:36", - "timeEnd": "2015-10-30 10:06:42" + "timeEnd": "2015-10-30 09:50:43" }, "geometry": { "type": "LineString", @@ -3502,18 +3126,6 @@ [ 120.1747155, 22.9837891 - ], - [ - 120.1602068, - 22.9770184 - ], - [ - 120.1593986, - 22.9778309 - ], - [ - 120.1595702, - 22.9771521 ] ] } @@ -5772,7 +5384,7 @@ "properties": { "device": "AndroidDevice_867159020039802", "timeBegin": "2015-10-27 13:57:24", - "timeEnd": "2015-10-27 14:50:36" + "timeEnd": "2015-10-27 14:23:47" }, "geometry": { "type": "LineString", @@ -5804,18 +5416,6 @@ [ 120.2158389, 22.9955736 - ], - [ - 120.2136834, - 22.9765987 - ], - [ - 120.2144873, - 22.9767162 - ], - [ - 120.214501, - 22.9767162 ] ] } @@ -5890,7 +5490,7 @@ "properties": { "device": "AndroidDevice_867159020039802", "timeBegin": "2015-10-28 13:38:23", - "timeEnd": "2015-10-28 14:28:00" + "timeEnd": "2015-10-28 13:56:02" }, "geometry": { "type": "LineString", @@ -5906,30 +5506,6 @@ [ 120.2122907, 22.9826179 - ], - [ - 120.2240422, - 22.990885 - ], - [ - 120.2267213, - 22.9912655 - ], - [ - 120.2266939, - 22.9913693 - ], - [ - 120.2266603, - 22.9909803 - ], - [ - 120.2268676, - 22.9909323 - ], - [ - 120.2273976, - 22.9905451 ] ] } @@ -5939,7 +5515,7 @@ "properties": { "device": "AndroidDevice_867159020039802", "timeBegin": "2015-10-29 08:35:02", - "timeEnd": "2015-10-29 09:47:12" + "timeEnd": "2015-10-29 09:40:12" }, "geometry": { "type": "LineString", @@ -6199,10 +5775,6 @@ [ 120.2178464, 22.9825287 - ], - [ - 120.2295744, - 22.9730294 ] ] } @@ -6212,7 +5784,7 @@ "properties": { "device": "AndroidDevice_867159020039802", "timeBegin": "2015-10-29 13:18:40", - "timeEnd": "2015-10-29 15:11:42" + "timeEnd": "2015-10-29 13:39:43" }, "geometry": { "type": "LineString", @@ -6240,43 +5812,20 @@ [ 120.2308606, 22.9680599 - ], - [ - 120.2377316, - 22.9827932 - ], - [ - 120.2372351, - 22.9831241 - ], - [ - 120.2383215, - 22.9836974 - ], - [ - 120.2375898, - 22.9834817 - ], - [ - 120.2370921, - 22.9835787 - ], - [ - 120.2373877, - 22.9841304 - ], - [ - 120.238142, - 22.9840122 - ], - [ - 120.2372241, - 22.9841105 - ], - [ - 120.2383821, - 22.9841358 - ], + ] + ] + } + }, + { + "type": "Feature", + "properties": { + "device": "AndroidDevice_867159020039802", + "timeBegin": "2015-10-29 14:43:43", + "timeEnd": "2015-10-29 15:11:42" + }, + "geometry": { + "type": "LineString", + "coordinates": [ [ 120.2384496, 22.9834412 @@ -6422,7 +5971,7 @@ "properties": { "device": "AndroidDevice_867159020039802", "timeBegin": "2015-10-30 13:20:24", - "timeEnd": "2015-10-30 15:39:38" + "timeEnd": "2015-10-30 13:46:40" }, "geometry": { "type": "LineString", @@ -6446,51 +5995,20 @@ [ 120.228576, 22.9761365 - ], - [ - 120.2161739, - 22.9885627 - ], - [ - 120.2163863, - 22.9896861 - ], - [ - 120.2158254, - 22.9896574 - ], - [ - 120.2153119, - 22.9897737 - ], - [ - 120.2153414, - 22.989745 - ], - [ - 120.2157226, - 22.9896385 - ], - [ - 120.2163497, - 22.9896396 - ], - [ - 120.2161924, - 22.9890204 - ], - [ - 120.2153762, - 22.9892908 - ], - [ - 120.2154238, - 22.9892491 - ], - [ - 120.2152393, - 22.989764 - ], + ] + ] + } + }, + { + "type": "Feature", + "properties": { + "device": "AndroidDevice_867159020039802", + "timeBegin": "2015-10-30 14:49:37", + "timeEnd": "2015-10-30 15:39:38" + }, + "geometry": { + "type": "LineString", + "coordinates": [ [ 120.2214214, 22.991998 @@ -6682,7 +6200,7 @@ "properties": { "device": "AndroidDevice_867159020026866", "timeBegin": "2015-10-30 13:29:02", - "timeEnd": "2015-10-30 15:30:49" + "timeEnd": "2015-10-30 15:18:16" }, "geometry": { "type": "LineString", @@ -6750,10 +6268,6 @@ [ 120.2274596, 22.9808873 - ], - [ - 120.2366021, - 22.9621942 ] ] } @@ -6965,7 +6479,7 @@ "properties": { "device": "AndroidDevice_867159020023111", "timeBegin": "2015-10-30 08:50:16", - "timeEnd": "2015-10-30 11:49:33" + "timeEnd": "2015-10-30 09:14:42" }, "geometry": { "type": "LineString", @@ -6997,67 +6511,20 @@ [ 120.2005293, 23.011908 - ], - [ - 120.1844849, - 23.0097781 - ], - [ - 120.1825557, - 23.0102267 - ], - [ - 120.1824778, - 23.0105478 - ], - [ - 120.1824808, - 23.0105768 - ], - [ - 120.1824564, - 23.0103856 - ], - [ - 120.1834726, - 23.0112068 - ], - [ - 120.1825881, - 23.0114334 - ], - [ - 120.1825201, - 23.0118392 - ], - [ - 120.1826206, - 23.0115995 - ], - [ - 120.1825046, - 23.0117055 - ], - [ - 120.1824034, - 23.0117517 - ], - [ - 120.1823145, - 23.0113637 - ], - [ - 120.1824024, - 23.0117523 - ], - [ - 120.1824498, - 23.011704 - ], - [ - 120.1825816, - 23.0116789 - ], + ] + ] + } + }, + { + "type": "Feature", + "properties": { + "device": "AndroidDevice_867159020023111", + "timeBegin": "2015-10-30 10:18:43", + "timeEnd": "2015-10-30 11:49:33" + }, + "geometry": { + "type": "LineString", + "coordinates": [ [ 120.2053855, 23.0216561 @@ -8247,14 +7714,6 @@ 120.2349516667, 22.99976 ], - [ - 120.2471466667, - 22.98746 - ], - [ - 120.2518066667, - 22.9844733333 - ], [ 120.2342833333, 22.9979816667 @@ -11581,7 +11040,7 @@ "properties": { "device": "AndroidDevice_867159020039794", "timeBegin": "2015-10-27 08:03:39", - "timeEnd": "2015-10-27 10:53:57" + "timeEnd": "2015-10-27 10:43:54" }, "geometry": { "type": "LineString", @@ -11781,14 +11240,6 @@ [ 120.1781334, 22.9991368 - ], - [ - 120.1439203, - 22.9958406 - ], - [ - 120.1437851, - 22.9957435 ] ] } diff --git a/tracks/query.php b/tracks/query.php index 010fe1a6..5c7fa4c6 100644 --- a/tracks/query.php +++ b/tracks/query.php @@ -36,7 +36,6 @@ if ($currentPoint === $lastPoint) { continue; } - $lastPoint = $currentPoint; $pointTime = strtotime($line[4]); $weekNum = date('YW', $pointTime); if (!isset($data[$weekNum])) { @@ -57,11 +56,14 @@ $currentPoint ), ); + } elseif (isset($lastPoint[1]) && getDistance($currentPoint[1], $currentPoint[0], $lastPoint[1], $lastPoint[0]) > 1.5) { + continue; } else { $data[$weekNum][$lastKey]['timeEnd'] = $line[4]; $data[$weekNum][$lastKey]['points'][] = $currentPoint; } $lastTime = $pointTime; + $lastPoint = $currentPoint; } } } @@ -92,4 +94,17 @@ $fc->features[] = $f; } file_put_contents($yPath . '/' . $weekNum . '.json', json_encode($fc, JSON_UNESCAPED_UNICODE | JSON_PRETTY_PRINT)); -} \ No newline at end of file +} + +/* + * function from http://www.mapanet.eu/EN/Resources/Script-Distance.htm + */ + +function getDistance($lat1, $lon1, $lat2, $lon2) { + + $radius = 6378.137; // earth mean radius defined by WGS84 + $dlon = $lon1 - $lon2; + $distance = acos(sin(deg2rad($lat1)) * sin(deg2rad($lat2)) + cos(deg2rad($lat1)) * cos(deg2rad($lat2)) * cos(deg2rad($dlon))) * $radius; + + return $distance; //kilometers +}