updated geodiff to 0.4

Author: varmar05

Pipfile

@@ -5,7 +5,7 @@ name = "pypi"
 
 [packages]
 python-dateutil = "==2.6.0"
-pygeodiff = "==0.3.0"
+pygeodiff = "==0.4.0"
 
 
 [dev-packages]

Pipfile.lock

@@ -297,7 +297,7 @@ def get_push_changes(self):
             diff_file = self.fpath_meta(diff_name)
             try:
                 self.geodiff.create_changeset(origin_file, current_file, diff_file)
-                if self.geodiff.list_changes(diff_file):
+                if self.geodiff.has_changes(diff_file):
                     diff_size = os.path.getsize(diff_file)
                     file['checksum'] = file['origin_checksum']  # need to match basefile on server
                     file['chunks'] = [str(uuid.uuid4()) for i in range(math.ceil(diff_size / UPLOAD_CHUNK_SIZE))]
@@ -352,7 +352,7 @@ def apply_pull_changes(self, changes, temp_dir):
                 basefile = self.fpath_meta(path)
 
                 # special care is needed for geodiff files
-                if self.geodiff and k == 'updated':
+                if self.is_versioned_file(path) and k == 'updated':
                     if path in modified:
                         server_diff = self.fpath(f'{path}-server_diff', temp_dir)  # single origin diff from 'diffs' for use in rebase
                         rebased_diff = self.fpath(f'{path}-rebased', temp_dir)

mergin/client.py

@@ -227,7 +227,7 @@ def toggle_geodiff(enabled):
     mc.push_project(project_dir)
     if push_geodiff_enabled:
         mp.geodiff.create_changeset(mp.fpath(f_updated), mp.fpath_meta(f_updated), mp.fpath_meta('push_diff'))
-        assert not mp.geodiff.list_changes(mp.fpath_meta('push_diff'))
+        assert not mp.geodiff.has_changes(mp.fpath_meta('push_diff'))
     else:
         assert not os.path.exists(mp.fpath_meta(f_updated))
     # step 2) base.gpkg updated to inserted_1_A_mod (modified 2 features)
@@ -262,7 +262,7 @@ def toggle_geodiff(enabled):
     mc.pull_project(project_dir_2)
     if pull_geodiff_enabled:
         mp2.geodiff.create_changeset(mp.fpath(f_updated), mp2.fpath(f_updated), mp2.fpath_meta('diff'))
-        assert not mp2.geodiff.list_changes(mp2.fpath_meta('diff'))
+        assert not mp2.geodiff.has_changes(mp2.fpath_meta('diff'))
     else:
         server_file_checksum = next((f['checksum'] for f in project_info['files'] if f['path'] == f_updated), '')
         assert server_file_checksum == generate_checksum(mp2.fpath(f_updated))
@@ -285,6 +285,6 @@ def toggle_geodiff(enabled):
     mc.pull_project(project_dir)
     if pull_geodiff_enabled:
         mp3.geodiff.create_changeset(mp.fpath(f_updated), mp3.fpath(f_updated), mp.fpath_meta('diff'))
-        assert not mp3.geodiff.list_changes(mp.fpath_meta('diff'))
+        assert not mp3.geodiff.has_changes(mp.fpath_meta('diff'))
     else:
         assert os.path.exists(mp.fpath('base.gpkg_conflict_copy'))