Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add geojson format and dedup arg #42

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add geojson format and dedup arg #42

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 41 additions & 4 deletions location_history_json_converter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,9 @@ def _write_header(output, format, js_variable, separator):
output.write("window.%s = " % js_variable)
output.write("{\"locations\":[")
return

if format == "geojson":
output.write("{\"type\": \"FeatureCollection\", \"features\": [")

if format == "csv":
output.write(separator.join(["Time", "Latitude", "Longitude"]) + "\n")
Expand Down Expand Up @@ -160,6 +163,23 @@ def _write_location(output, format, location, separator, first, last_location):
output.write(json.dumps(item, separators=(',', ':')))
return

if format == "geojson":
if not first:
output.write(",")

item = {
"type": "Feature",
"properties": {},
"geometry": {
"type": "Point",
"coordinates": [
round(location["longitudeE7"] / 10000000, 8),
round(location["latitudeE7"] / 10000000, 8)
]
}
}
output.write(json.dumps(item, separators=(',', ':')))

if format == "jsonfull" or format == "jsfull":
if not first:
output.write(",")
Expand Down Expand Up @@ -312,11 +332,12 @@ def _write_location(output, format, location, separator, first, last_location):
def _write_footer(output, format):
"""Writes the file footer for the specified format to output"""

if format == "json" or format == "js" or format == "jsonfull" or format == "jsfull":
if format == "json" or format == "js" or format == "jsonfull" or format == "jsfull" or format == "geojson":
output.write("]}")
if format == "js" or format == "jsfull":
output.write(";")
return


if format == "kml":
output.write(" </Document>\n</kml>\n")
Expand All @@ -333,7 +354,7 @@ def _write_footer(output, format):
def convert(locations, output, format="kml",
js_variable="locationJsonData", separator=",",
start_date=None, end_date=None, accuracy=None, polygon=None,
chronological=False):
chronological=False, dedup=None):
"""Converts the provided locations to the specified format

Parameters
Expand Down Expand Up @@ -378,6 +399,7 @@ def convert(locations, output, format="kml",

_write_header(output, format, js_variable, separator)

dedup_history = {}
first = True
last_loc = None
added = 0
Expand Down Expand Up @@ -411,8 +433,21 @@ def convert(locations, output, format="kml",
if item["longitudeE7"] > 1800000000:
item["longitudeE7"] = item["longitudeE7"] - 4294967296

if dedup is not None:
dedup_latitude = round(item["latitudeE7"] / 10 ** dedup, 0)
dedup_longitude = round(item["longitudeE7"] / 10 ** dedup, 0)
dedupkey = f'{dedup_latitude}{dedup_longitude}'
if dedupkey in dedup_history:
continue

_write_location(output, format, item, separator, first, last_loc)

if dedup is not None:
dedup_latitude = round(item["latitudeE7"] / 10 ** dedup, 0)
dedup_longitude = round(item["longitudeE7"] / 10 ** dedup, 0)
dedupkey = f'{dedup_latitude}{dedup_longitude}'
dedup_history[dedupkey] = True

if first:
first = False
last_loc = item
Expand All @@ -430,7 +465,7 @@ def main():
arg_parser.add_argument(
"-f",
"--format",
choices=["kml", "json", "js", "jsonfull", "jsfull", "csv", "csvfull", "csvfullest", "gpx", "gpxtracks"],
choices=["kml", "json", "js", "jsonfull", "jsfull", "csv", "csvfull", "csvfullest", "gpx", "gpxtracks", "geojson"],
default="kml",
help="Format of the output"
)
Expand All @@ -446,6 +481,7 @@ def main():
arg_parser.add_argument("--starttime", help="The Start Time - format HH:MM, only used if Start Date is set", type=_valid_time)
arg_parser.add_argument("--endtime", help="The End Time - format HH:MM, only used if End Date is set", type=_valid_time)
arg_parser.add_argument("-a", "--accuracy", help="Maximum accuracy (in meters), lower is better.", type=int)
arg_parser.add_argument("-d", "--dedup", help="dedup if two points are too close to each other", type=int)

arg_parser.add_argument(
"-c", "--chronological",
Expand Down Expand Up @@ -575,7 +611,8 @@ def main():
end_date=args.enddate,
accuracy=args.accuracy,
polygon=polygon,
chronological=args.chronological
chronological=args.chronological,
dedup=args.dedup
)

f_out.close()
Expand Down