Code

Merge to main repo#905

Code

Merged

shankari merged 135 commits intoe-mission:gis-based-mode-detectione-mission/e-mission-server:gis-based-mode-detectionfrom shankari:gis-based-mode-detectionshankari/e-mission-server:gis-based-mode-detectionCopy head branch name to clipboardApr 17, 2023

+550,316-391

Commits

Commits on Jan 5, 2023

• Add server-side support for storing trip and place additions

  Show description for 655b53b
  shankari

  committed
  655b53b

  Copy full SHA for 655b53b

• Change the input matcher to support multiple matches for a single trip

  Show description for 2129075
  shankari

  committed
  2129075

  Copy full SHA for 2129075

• Fix field addition to confirmed trip

  Show description for 28a3b75
  shankari

  committed
  28a3b75

  Copy full SHA for 28a3b75

• Add additional unit tests for the incoming matching

  shankari

  committed
  bdcf629

  Copy full SHA for bdcf629

Commits on Jan 15, 2023

• Start adding unit tests for finding the final candiate

  shankari

  committed
  34d78fc

  Copy full SHA for 34d78fc

Commits on Jan 18, 2023

• Merge branch 'master' of https://github.com/e-mission/e-mission-server into add_trip_place_additions

  shankari

  committed
  ae4983e

  Copy full SHA for ae4983e

• Handle the matching of user inputs that came in before the confirmed trip was created

  Show description for a7ee02c
  shankari

  committed
  a7ee02c

  Copy full SHA for a7ee02c

• Fix syntax errors in get_additions_for_trip_object

  Show description for bad2d69
  shankari

  committed
  bad2d69

  Copy full SHA for bad2d69

• Match by match_id instead of _id

  Show description for d534ed0
  shankari

  committed
  d534ed0

  Copy full SHA for d534ed0

Commits on Jan 19, 2023

• Fix regression in the input matching for new entries

  Show description for fcf5a9c
  shankari

  committed
  fcf5a9c

  Copy full SHA for fcf5a9c

• Pass in the continue_on_error flag to cache series insertion from this other location as well

  Show description for ef2ce21
  shankari

  committed
  ef2ce21

  Copy full SHA for ef2ce21

Commits on Feb 3, 2023

• Create confirmedplace.py

  Show description for 8abd2ef
  sebastianbarry

  committed
  8abd2ef

  Copy full SHA for 8abd2ef

Commits on Feb 10, 2023

• Updating Conda version

  swastis10

  committed
  fd8526e

  Copy full SHA for fd8526e

• Delete miniconda.sh

  swastis10

  authored
  81682dd

  Copy full SHA for 81682dd

Commits on Feb 13, 2023

• Added confirmedplace in entry.py and builtin_timeseries.py

  sebastianbarry

  committed
  743eca0

  Copy full SHA for 743eca0

• Removed expectedplace.py and inferredplace.py

  Show description for 64cab33
  sebastianbarry

  committed
  64cab33

  Copy full SHA for 64cab33

• Fixing TestMongoGeoJSONQueries Test case

  swastis10

  committed
  80c5829

  Copy full SHA for 80c5829

• Merge branch 'conda_version_upgrade' of https://github.com/swastis10/e-mission-server into conda_version_upgrade

  swastis10

  committed
  82c6a89

  Copy full SHA for 82c6a89

• Delete .gitignore

  swastis10

  authored
  29367c1

  Copy full SHA for 29367c1

• adding gitignore back

  swastis10

  committed
  4b4d9f0

  Copy full SHA for 4b4d9f0

Commits on Feb 15, 2023

• Added confirmedplace into the pipeline

  Show description for 9220dd2
  sebastianbarry

  committed
  9220dd2

  Copy full SHA for 9220dd2

• First draft

  sebastianbarry

  committed
  e8a910d

  Copy full SHA for e8a910d

• create confirmed_places during CREATE_CONFIRMED_OBJECTS

  Show description for 286f233
  JGreenlee

  committed
  286f233

  Copy full SHA for 286f233

Commits on Feb 16, 2023

• implement CREATE_COMPOSITE_OBJECTS

  Show description for 9eb812d
  JGreenlee

  committed
  9eb812d

  Copy full SHA for 9eb812d

Commits on Feb 20, 2023

• Change confirmed_trip variable to confirmed_object for consistency

  Show description for 5cdbdeb
  sebastianbarry

  committed
  5cdbdeb

  Copy full SHA for 5cdbdeb

• Remove unnecessary confirmed_place properties

  Show description for 64f1f51
  sebastianbarry

  committed
  64f1f51

  Copy full SHA for 64f1f51

• Remove info log spew by replacing Logging.info changes back to Logging.debug

  Show description for 3fbc72d
  sebastianbarry

  committed
  3fbc72d

  Copy full SHA for 3fbc72d

• update confirmed_place properties

  Show description for d016b3d
  JGreenlee

  committed
  d016b3d

  Copy full SHA for d016b3d

Commits on Feb 22, 2023

• add a locations property to composite trip

  JGreenlee

  committed
  3d62c81

  Copy full SHA for 3d62c81

• correct confirmed_place generation

  JGreenlee

  committed
  34baef6

  Copy full SHA for 34baef6

• use enter_ts to query places and mark stage done

  JGreenlee

  committed
  d90de7f

  Copy full SHA for d90de7f

Commits on Feb 23, 2023

• revise input matching functions

  JGreenlee

  committed
  b690b0c

  Copy full SHA for b690b0c

Commits on Mar 6, 2023

• Changing timestamp to int_timestamp

  Show description for 5ee9e54
  swastis10

  committed
  5ee9e54

  Copy full SHA for 5ee9e54

• Changing collections.remove to delete_many.

  Show description for cb8d4ae
  swastis10

  committed
  cb8d4ae

  Copy full SHA for cb8d4ae

• Converting timestamp to float as Timestamp strings are no longer supported in the arrow.get()

  Show description for a6ac020
  swastis10

  committed
  a6ac020

  Copy full SHA for a6ac020

• Using uuidRepresentation as 'pythonLegacy'

  Show description for 9c683cf
  swastis10

  committed
  9c683cf

  Copy full SHA for 9c683cf

• Dealing with default percision of GeoJson v2.5

  Show description for d2ada64
  swastis10

  committed
  d2ada64

  Copy full SHA for d2ada64

• Fixing broken pd.merge due to Pandas upgrade

  Show description for a760b55
  swastis10

  committed
  a760b55

  Copy full SHA for a760b55

• Adding comments to remove GeoJSON monkey patch

  swastis10

  committed
  5375321

  Copy full SHA for 5375321

Commits on Mar 8, 2023

• Loading $uuid as UUID representation

  Show description for 6ac02a2
  swastis10

  committed
  6ac02a2

  Copy full SHA for 6ac02a2

Commits on Mar 9, 2023

• Remove weird overwrite of start and end timestamps on android

  Show description for 01e0bb3
  shankari

  committed
  01e0bb3

  Copy full SHA for 01e0bb3

• Loading $uuid as UUID representation

  Show description for 3b456e7
  swastis10

  committed
  3b456e7

  Copy full SHA for 3b456e7

Commits on Mar 10, 2023

• 🐛 Read the match ID from 'data' instead of directly from the entry

  Show description for 9aed65d
  shankari

  committed
  9aed65d

  Copy full SHA for 9aed65d

• add keys for place user input

  JGreenlee

  committed
  763a3cb

  Copy full SHA for 763a3cb

• revise input matching

  JGreenlee

  committed
  6bc5f84

  Copy full SHA for 6bc5f84

• modify user input tests

  Show description for 1cc481e
  JGreenlee

  committed
  1cc481e

  Copy full SHA for 1cc481e

• Merge pull request e-mission#900 from swastis10/conda_version_upgrade

  Show description for 5b839e1
  shankari

  authored
  5b839e1

  Copy full SHA for 5b839e1

• Merge branch 'add_trip_place_additions' into add-composite-trip

  JGreenlee

  authored
  73841ab

  Copy full SHA for 73841ab

Commits on Mar 11, 2023

• Configuring PYTHON_LEGACY UUID representation in bottle.py

  Show description for edd8b77
  swastis10

  committed
  edd8b77

  Copy full SHA for edd8b77

• Configuring PYTHON_LEGACY UUID representation in cfc_webapp.py

  Show description for 4492edf
  swastis10

  committed
  4492edf

  Copy full SHA for 4492edf

• Merge pull request e-mission#902 from swastis10/server_upgrade

  Show description for 1a37427
  shankari

  authored
  1a37427

  Copy full SHA for 1a37427

• unify tripuserinput and placeuserinput

  Show description for 9b75391
  JGreenlee

  committed
  9b75391

  Copy full SHA for 9b75391

• add logic to check places for inputs

  JGreenlee

  committed
  c51aee9

  Copy full SHA for c51aee9

• revise unit tests to work with places matching

  JGreenlee

  committed
  8bcacc3

  Copy full SHA for 8bcacc3

• fix matching on last place

  JGreenlee

  committed
  2573ced

  Copy full SHA for 2573ced

• expand tests to check trip&place additions

  JGreenlee

  committed
  d0c46f6

  Copy full SHA for d0c46f6

Commits on Mar 22, 2023

• Merge pull request #4 from sebastianbarry/add-composite-trip

  Show description for 52ecab2
  shankari

  authored
  52ecab2

  Copy full SHA for 52ecab2

• fix missing confirmed_places on existing confirmed_trips

  JGreenlee

  committed
  1c3f128

  Copy full SHA for 1c3f128

• insert confirmed_place_entry to ts

  JGreenlee

  committed
  180a979

  Copy full SHA for 180a979

• receive confirmed place id from ts.insert()

  Show description for 7fa3aa7
  

  JGreenlee

  and

  shankari

  authored
  7fa3aa7

  Copy full SHA for 7fa3aa7

• Merge pull request #5 from sebastianbarry/update-missing-confirmed-places

  Show description for 8709243
  shankari

  authored
  8709243

  Copy full SHA for 8709243

• Remove hack where programs starting with stage always default to token list

  Show description for 63f3bb3
  shankari

  committed
  63f3bb3

  Copy full SHA for 63f3bb3

• Merge branch 'master' of https://github.com/e-mission/e-mission-server

  shankari

  committed
  ef496b5

  Copy full SHA for ef496b5

• Fix the elif check before any if

  Show description for ae839a6
  shankari

  committed
  ae839a6

  Copy full SHA for ae839a6

Commits on Mar 24, 2023

• comments explaining unit test changes

  JGreenlee

  committed
  0c5d1a5

  Copy full SHA for 0c5d1a5

• refactor composite trip creation into composite_trip_creation.py

  JGreenlee

  committed
  e4265d5

  Copy full SHA for e4265d5

• optimize get_confirmed_obj_for_user_input_obj

  Show description for 8f0bf45
  JGreenlee

  committed
  8f0bf45

  Copy full SHA for 8f0bf45

Commits on Mar 25, 2023

• tidy/refactor functions in trip_queries.py

  Show description for e34c463
  JGreenlee

  committed
  e34c463

  Copy full SHA for e34c463

• allow other keys than trip_user_input for trips

  JGreenlee

  committed
  3ea7b67

  Copy full SHA for 3ea7b67

• comment describing use of getattr

  JGreenlee

  committed
  a62fa09

  Copy full SHA for a62fa09

Commits on Mar 26, 2023

• import composite_trip_creation with alias eapcc

  JGreenlee

  committed
  54fd12e

  Copy full SHA for 54fd12e

Commits on Mar 27, 2023

• Merge pull request #6 from sebastianbarry/additions-and-composite-cleanup

  Show description for f56bd3c
  shankari

  authored
  f56bd3c

  Copy full SHA for f56bd3c

• Tweak the threshold for detecting untracked time to account for background restrictions

  Show description for df9d9f0
  shankari

  committed
  df9d9f0

  Copy full SHA for df9d9f0

• Merge pull request e-mission#903 from shankari/tweak_untracked_time_thresholds

  Show description for 8714c3b
  shankari

  authored
  8714c3b

  Copy full SHA for 8714c3b

Commits on Mar 28, 2023

• allow timeline to support IDing trips by a key

  JGreenlee

  committed
  7d544f3

  Copy full SHA for 7d544f3

• add real_examples that demonstrate untracked time

  JGreenlee

  committed
  9ea47e0

  Copy full SHA for 9ea47e0

• refactor confirmed object creation to use Timeline

  JGreenlee

  committed
  0aa7c83

  Copy full SHA for 0aa7c83

• include untracked time in composite trip creation

  JGreenlee

  committed
  9d41f1d

  Copy full SHA for 9d41f1d

• don't return early from create_composite_objects

  Show description for df93a93
  JGreenlee

  committed
  df93a93

  Copy full SHA for df93a93

• Don't break the composite trip creation pipeline stage if there are no trips

  Show description for c307647
  shankari

  committed
  c307647

  Copy full SHA for c307647

• Use the composite trip for the pipeline timestamps

  Show description for 02c910a
  shankari

  committed
  02c910a

  Copy full SHA for 02c910a

• Merge pull request #8 from shankari/minor_pipeline_fixes

  Show description for 2de4b4a
  shankari

  authored
  2de4b4a

  Copy full SHA for 2de4b4a

Commits on Mar 29, 2023

• Merge branch 'add_trip_place_additions' into untracked-composite-trip

  JGreenlee

  committed
  77f5db1

  Copy full SHA for 77f5db1

• include origin_key in composite trip

  Show description for 9c51961
  JGreenlee

  committed
  9c51961

  Copy full SHA for 9c51961

• Merge branch 'add_trip_place_additions' into untracked-composite-trip

  JGreenlee

  committed
  9bf0352

  Copy full SHA for 9bf0352

• declare composite trip origin_key before key

  JGreenlee

  committed
  8ac11d9

  Copy full SHA for 8ac11d9

• if using trip_id_key in Timeline, fallback to _id

  Show description for 5e885f1
  JGreenlee

  committed
  5e885f1

  Copy full SHA for 5e885f1

• include empty locations list in untracked composite

  JGreenlee

  committed
  5586b2c

  Copy full SHA for 5586b2c

Commits on Mar 30, 2023

• reword comments in create_confirmed_objects

  JGreenlee

  committed
  1c24095

  Copy full SHA for 1c24095

• create testJackUntrackedTimeMar12

  JGreenlee

  committed
  e81eede

  Copy full SHA for e81eede

• Tweak the threshold for detecting untracked time to account for background restrictions

  Show description for e50f88d
  

  shankari

  authored and

  JGreenlee

  committed
  e50f88d

  Copy full SHA for e50f88d

• add more unit tests for untracked time

  JGreenlee

  committed
  8cbdf43

  Copy full SHA for 8cbdf43

• add comment explaining places after untracked time

  JGreenlee

  committed
  8330b72

  Copy full SHA for 8330b72

Commits on Apr 4, 2023

• update expected test result: shankariUntrackedTimeJul20

  Show description for 1bb8a3e
  

  JGreenlee

  and

  shankari

  authored
  1bb8a3e

  Copy full SHA for 1bb8a3e

• Merge pull request #7 from sebastianbarry/untracked-composite-trip

  Show description for 9a43a07
  shankari

  authored
  9a43a07

  Copy full SHA for 9a43a07

Commits on Apr 5, 2023

• fix first composite trip of batch not being created

  Show description for 93039ce
  JGreenlee

  committed
  93039ce

  Copy full SHA for 93039ce

• make log statements clearer

  JGreenlee

  committed
  bad6126

  Copy full SHA for bad6126

• Rename confirmed_place in compositetrip to end_confirmed_place

  Show description for c816632
  sebastianbarry

  committed
  c816632

  Copy full SHA for c816632

• Ensure that the composite trip metadata reflects the time that it was created

  Show description for 418cffc
  shankari

  committed
  418cffc

  Copy full SHA for 418cffc

• Fix broken test case

  Show description for e769c6b
  shankari

  committed
  e769c6b

  Copy full SHA for e769c6b

• Merge pull request #9 from sebastianbarry/fix_first_composite_of_batch_not_created

  Show description for 73149e9
  shankari

  authored
  73149e9

  Copy full SHA for 73149e9

• Merge pull request #10 from sebastianbarry/add_trip_place_additions_end_and_start_confirmed_place

  Show description for 6a26c54
  shankari

  authored
  6a26c54

  Copy full SHA for 6a26c54

• Merge branch 'add_trip_place_additions' of https://github.com/shankari/e-mission-server into composite_metadata_fix

  shankari

  committed
  3527525

  Copy full SHA for 3527525

• Merge pull request #11 from shankari/composite_metadata_fix

  Show description for 014a611
  shankari

  authored
  014a611

  Copy full SHA for 014a611

• update expected composite trips for test JackMar12

  Show description for b3d06ba
  JGreenlee

  committed
  b3d06ba

  Copy full SHA for b3d06ba

• Merge pull request #12 from sebastianbarry/update-expected-composite-jackMar12

  Show description for 9f0de13
  shankari

  authored
  9f0de13

  Copy full SHA for 9f0de13

Commits on Apr 11, 2023

• Create and link the timeline properly, similar to the CLEAN_AND_RESAMPLE stage

  Show description for 157e6f9
  shankari

  committed
  157e6f9

  Copy full SHA for 157e6f9

• Fix the backwards compat to generate correct confirmed object timelines

  Show description for 0729b41
  shankari

  committed
  0729b41

  Copy full SHA for 0729b41

Commits on Apr 12, 2023

• Update composite trips when confirmed objects are updated

  Show description for 149025b
  shankari

  committed
  149025b

  Copy full SHA for 149025b

• Add unit tests to check the new functions in composite trip creation

  Show description for 33af6dd
  shankari

  committed
  33af6dd

  Copy full SHA for 33af6dd

Commits on Apr 13, 2023

• Expand the save_ground_truth script to also support saving a composite trip list

  Show description for 5410d56
  shankari

  committed
  5410d56

  Copy full SHA for 5410d56

• Fix population of start place additions when grafting timeline

  Show description for 57abb97
  shankari

  committed
  57abb97

  Copy full SHA for 57abb97

• Check in a new unit test to test incremental updates of the composite trips

  Show description for fb6a982
  shankari

  committed
  fb6a982

  Copy full SHA for fb6a982

• Multiple fixes to the hack code

  Show description for c97b49c
  shankari

  committed
  c97b49c

  Copy full SHA for c97b49c

• Change deprecated remove to delete_many

  Show description for b768571
  shankari

  committed
  b768571

  Copy full SHA for b768571

• Merge pull request #13 from shankari/fix_incremental_confirmed_obj_creation

  Show description for d3bbe37
  shankari

  authored
  d3bbe37

  Copy full SHA for d3bbe37

Commits on Apr 16, 2023

• Ensure that object <-> input matching code works properly

  Show description for 34dd104
  shankari

  committed
  34dd104

  Copy full SHA for 34dd104

• Fix new issue uncovered in existing incremental test

  Show description for 94ffc9e
  shankari

  committed
  94ffc9e

  Copy full SHA for 94ffc9e

• Set a flag to prevent the test data from being torn down

  Show description for 2d9ee58
  shankari

  committed
  2d9ee58

  Copy full SHA for 2d9ee58

• Final changes from cleaned_untracked -> confirmed_untracked

  Show description for cf48989
  shankari

  committed
  cf48989

  Copy full SHA for cf48989

• Merge pull request #15 from shankari/fix_object_to_addition_matching

  Show description for 61d6e5c
  shankari

  authored
  61d6e5c

  Copy full SHA for 61d6e5c

Commits on Apr 17, 2023

• Remove the ubuntu 18 environment + run manual tests on both OSX and ubuntu

  Show description for afd11c7
  shankari

  committed
  afd11c7

  Copy full SHA for afd11c7

• Merge branch 'add_trip_place_additions' of https://github.com/shankari/e-mission-server into add_trip_place_additions

  shankari

  committed
  f2647b9

  Copy full SHA for f2647b9

• Remove the teardown step from the docker tests

  Show description for 28ad00d
  shankari

  committed
  28ad00d

  Copy full SHA for 28ad00d

• Remove manual install test on OSX

  Show description for 1e67cd6
  shankari

  committed
  1e67cd6

  Copy full SHA for 1e67cd6

• Use EPOCH_MININUM when the start timestamp is None

  Show description for 0ad1c10
  shankari

  committed
  0ad1c10

  Copy full SHA for 0ad1c10

• Fix format of transition distance logging

  Show description for 564a9b5
  shankari

  committed
  564a9b5

  Copy full SHA for 564a9b5

• Merge branch 'master' into add_trip_place_additions

  shankari

  authored
  6045174

  Copy full SHA for 6045174

• Try setting the random seed for the test

  Show description for b74198d
  shankari

  committed
  b74198d

  Copy full SHA for b74198d

• Merge branch 'add_trip_place_additions' of https://github.com/shankari/e-mission-server into add_trip_place_additions

  shankari

  committed
  0b272d6

  Copy full SHA for 0b272d6

• Temporarily commenting out the start timestamp checks

  Show description for 90a3d92
  shankari

  committed
  90a3d92

  Copy full SHA for 90a3d92

• Expand the set of valid responses for the script tests

  Show description for 09de165
  shankari

  committed
  09de165

  Copy full SHA for 09de165

• Merge pull request e-mission#895 from shankari/add_trip_place_additions

  Show description for 022182f
  shankari

  authored
  022182f

  Copy full SHA for 022182f

• Merge branch 'master' of https://github.com/e-mission/e-mission-server into gis-based-mode-detection

  Show description for 6d17182
  shankari

  committed
  6d17182

  Copy full SHA for 6d17182

• Fix broken tests on the GIS branch

  Show description for e8268de
  shankari

  committed
  e8268de

  Copy full SHA for e8268de