fit-changedetector 0.1.0a1__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- fit_changedetector-0.1.0a1/LICENSE +201 -0
- fit_changedetector-0.1.0a1/PKG-INFO +301 -0
- fit_changedetector-0.1.0a1/README.md +274 -0
- fit_changedetector-0.1.0a1/pyproject.toml +48 -0
- fit_changedetector-0.1.0a1/setup.cfg +4 -0
- fit_changedetector-0.1.0a1/src/fit_changedetector/__init__.py +42 -0
- fit_changedetector-0.1.0a1/src/fit_changedetector/arcgis.py +222 -0
- fit_changedetector-0.1.0a1/src/fit_changedetector/arcgis_ToolValidator.py +99 -0
- fit_changedetector-0.1.0a1/src/fit_changedetector/changedetector.py +1133 -0
- fit_changedetector-0.1.0a1/src/fit_changedetector/cli.py +412 -0
- fit_changedetector-0.1.0a1/src/fit_changedetector.egg-info/PKG-INFO +301 -0
- fit_changedetector-0.1.0a1/src/fit_changedetector.egg-info/SOURCES.txt +16 -0
- fit_changedetector-0.1.0a1/src/fit_changedetector.egg-info/dependency_links.txt +1 -0
- fit_changedetector-0.1.0a1/src/fit_changedetector.egg-info/entry_points.txt +2 -0
- fit_changedetector-0.1.0a1/src/fit_changedetector.egg-info/requires.txt +9 -0
- fit_changedetector-0.1.0a1/src/fit_changedetector.egg-info/top_level.txt +1 -0
- fit_changedetector-0.1.0a1/tests/test_cli.py +366 -0
- fit_changedetector-0.1.0a1/tests/test_diffs.py +962 -0
|
@@ -0,0 +1,201 @@
|
|
|
1
|
+
Apache License
|
|
2
|
+
Version 2.0, January 2004
|
|
3
|
+
http://www.apache.org/licenses/
|
|
4
|
+
|
|
5
|
+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
|
|
6
|
+
|
|
7
|
+
1. Definitions.
|
|
8
|
+
|
|
9
|
+
"License" shall mean the terms and conditions for use, reproduction,
|
|
10
|
+
and distribution as defined by Sections 1 through 9 of this document.
|
|
11
|
+
|
|
12
|
+
"Licensor" shall mean the copyright owner or entity authorized by
|
|
13
|
+
the copyright owner that is granting the License.
|
|
14
|
+
|
|
15
|
+
"Legal Entity" shall mean the union of the acting entity and all
|
|
16
|
+
other entities that control, are controlled by, or are under common
|
|
17
|
+
control with that entity. For the purposes of this definition,
|
|
18
|
+
"control" means (i) the power, direct or indirect, to cause the
|
|
19
|
+
direction or management of such entity, whether by contract or
|
|
20
|
+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
|
|
21
|
+
outstanding shares, or (iii) beneficial ownership of such entity.
|
|
22
|
+
|
|
23
|
+
"You" (or "Your") shall mean an individual or Legal Entity
|
|
24
|
+
exercising permissions granted by this License.
|
|
25
|
+
|
|
26
|
+
"Source" form shall mean the preferred form for making modifications,
|
|
27
|
+
including but not limited to software source code, documentation
|
|
28
|
+
source, and configuration files.
|
|
29
|
+
|
|
30
|
+
"Object" form shall mean any form resulting from mechanical
|
|
31
|
+
transformation or translation of a Source form, including but
|
|
32
|
+
not limited to compiled object code, generated documentation,
|
|
33
|
+
and conversions to other media types.
|
|
34
|
+
|
|
35
|
+
"Work" shall mean the work of authorship, whether in Source or
|
|
36
|
+
Object form, made available under the License, as indicated by a
|
|
37
|
+
copyright notice that is included in or attached to the work
|
|
38
|
+
(an example is provided in the Appendix below).
|
|
39
|
+
|
|
40
|
+
"Derivative Works" shall mean any work, whether in Source or Object
|
|
41
|
+
form, that is based on (or derived from) the Work and for which the
|
|
42
|
+
editorial revisions, annotations, elaborations, or other modifications
|
|
43
|
+
represent, as a whole, an original work of authorship. For the purposes
|
|
44
|
+
of this License, Derivative Works shall not include works that remain
|
|
45
|
+
separable from, or merely link (or bind by name) to the interfaces of,
|
|
46
|
+
the Work and Derivative Works thereof.
|
|
47
|
+
|
|
48
|
+
"Contribution" shall mean any work of authorship, including
|
|
49
|
+
the original version of the Work and any modifications or additions
|
|
50
|
+
to that Work or Derivative Works thereof, that is intentionally
|
|
51
|
+
submitted to Licensor for inclusion in the Work by the copyright owner
|
|
52
|
+
or by an individual or Legal Entity authorized to submit on behalf of
|
|
53
|
+
the copyright owner. For the purposes of this definition, "submitted"
|
|
54
|
+
means any form of electronic, verbal, or written communication sent
|
|
55
|
+
to the Licensor or its representatives, including but not limited to
|
|
56
|
+
communication on electronic mailing lists, source code control systems,
|
|
57
|
+
and issue tracking systems that are managed by, or on behalf of, the
|
|
58
|
+
Licensor for the purpose of discussing and improving the Work, but
|
|
59
|
+
excluding communication that is conspicuously marked or otherwise
|
|
60
|
+
designated in writing by the copyright owner as "Not a Contribution."
|
|
61
|
+
|
|
62
|
+
"Contributor" shall mean Licensor and any individual or Legal Entity
|
|
63
|
+
on behalf of whom a Contribution has been received by Licensor and
|
|
64
|
+
subsequently incorporated within the Work.
|
|
65
|
+
|
|
66
|
+
2. Grant of Copyright License. Subject to the terms and conditions of
|
|
67
|
+
this License, each Contributor hereby grants to You a perpetual,
|
|
68
|
+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
|
69
|
+
copyright license to reproduce, prepare Derivative Works of,
|
|
70
|
+
publicly display, publicly perform, sublicense, and distribute the
|
|
71
|
+
Work and such Derivative Works in Source or Object form.
|
|
72
|
+
|
|
73
|
+
3. Grant of Patent License. Subject to the terms and conditions of
|
|
74
|
+
this License, each Contributor hereby grants to You a perpetual,
|
|
75
|
+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
|
76
|
+
(except as stated in this section) patent license to make, have made,
|
|
77
|
+
use, offer to sell, sell, import, and otherwise transfer the Work,
|
|
78
|
+
where such license applies only to those patent claims licensable
|
|
79
|
+
by such Contributor that are necessarily infringed by their
|
|
80
|
+
Contribution(s) alone or by combination of their Contribution(s)
|
|
81
|
+
with the Work to which such Contribution(s) was submitted. If You
|
|
82
|
+
institute patent litigation against any entity (including a
|
|
83
|
+
cross-claim or counterclaim in a lawsuit) alleging that the Work
|
|
84
|
+
or a Contribution incorporated within the Work constitutes direct
|
|
85
|
+
or contributory patent infringement, then any patent licenses
|
|
86
|
+
granted to You under this License for that Work shall terminate
|
|
87
|
+
as of the date such litigation is filed.
|
|
88
|
+
|
|
89
|
+
4. Redistribution. You may reproduce and distribute copies of the
|
|
90
|
+
Work or Derivative Works thereof in any medium, with or without
|
|
91
|
+
modifications, and in Source or Object form, provided that You
|
|
92
|
+
meet the following conditions:
|
|
93
|
+
|
|
94
|
+
(a) You must give any other recipients of the Work or
|
|
95
|
+
Derivative Works a copy of this License; and
|
|
96
|
+
|
|
97
|
+
(b) You must cause any modified files to carry prominent notices
|
|
98
|
+
stating that You changed the files; and
|
|
99
|
+
|
|
100
|
+
(c) You must retain, in the Source form of any Derivative Works
|
|
101
|
+
that You distribute, all copyright, patent, trademark, and
|
|
102
|
+
attribution notices from the Source form of the Work,
|
|
103
|
+
excluding those notices that do not pertain to any part of
|
|
104
|
+
the Derivative Works; and
|
|
105
|
+
|
|
106
|
+
(d) If the Work includes a "NOTICE" text file as part of its
|
|
107
|
+
distribution, then any Derivative Works that You distribute must
|
|
108
|
+
include a readable copy of the attribution notices contained
|
|
109
|
+
within such NOTICE file, excluding those notices that do not
|
|
110
|
+
pertain to any part of the Derivative Works, in at least one
|
|
111
|
+
of the following places: within a NOTICE text file distributed
|
|
112
|
+
as part of the Derivative Works; within the Source form or
|
|
113
|
+
documentation, if provided along with the Derivative Works; or,
|
|
114
|
+
within a display generated by the Derivative Works, if and
|
|
115
|
+
wherever such third-party notices normally appear. The contents
|
|
116
|
+
of the NOTICE file are for informational purposes only and
|
|
117
|
+
do not modify the License. You may add Your own attribution
|
|
118
|
+
notices within Derivative Works that You distribute, alongside
|
|
119
|
+
or as an addendum to the NOTICE text from the Work, provided
|
|
120
|
+
that such additional attribution notices cannot be construed
|
|
121
|
+
as modifying the License.
|
|
122
|
+
|
|
123
|
+
You may add Your own copyright statement to Your modifications and
|
|
124
|
+
may provide additional or different license terms and conditions
|
|
125
|
+
for use, reproduction, or distribution of Your modifications, or
|
|
126
|
+
for any such Derivative Works as a whole, provided Your use,
|
|
127
|
+
reproduction, and distribution of the Work otherwise complies with
|
|
128
|
+
the conditions stated in this License.
|
|
129
|
+
|
|
130
|
+
5. Submission of Contributions. Unless You explicitly state otherwise,
|
|
131
|
+
any Contribution intentionally submitted for inclusion in the Work
|
|
132
|
+
by You to the Licensor shall be under the terms and conditions of
|
|
133
|
+
this License, without any additional terms or conditions.
|
|
134
|
+
Notwithstanding the above, nothing herein shall supersede or modify
|
|
135
|
+
the terms of any separate license agreement you may have executed
|
|
136
|
+
with Licensor regarding such Contributions.
|
|
137
|
+
|
|
138
|
+
6. Trademarks. This License does not grant permission to use the trade
|
|
139
|
+
names, trademarks, service marks, or product names of the Licensor,
|
|
140
|
+
except as required for reasonable and customary use in describing the
|
|
141
|
+
origin of the Work and reproducing the content of the NOTICE file.
|
|
142
|
+
|
|
143
|
+
7. Disclaimer of Warranty. Unless required by applicable law or
|
|
144
|
+
agreed to in writing, Licensor provides the Work (and each
|
|
145
|
+
Contributor provides its Contributions) on an "AS IS" BASIS,
|
|
146
|
+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
|
147
|
+
implied, including, without limitation, any warranties or conditions
|
|
148
|
+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
|
|
149
|
+
PARTICULAR PURPOSE. You are solely responsible for determining the
|
|
150
|
+
appropriateness of using or redistributing the Work and assume any
|
|
151
|
+
risks associated with Your exercise of permissions under this License.
|
|
152
|
+
|
|
153
|
+
8. Limitation of Liability. In no event and under no legal theory,
|
|
154
|
+
whether in tort (including negligence), contract, or otherwise,
|
|
155
|
+
unless required by applicable law (such as deliberate and grossly
|
|
156
|
+
negligent acts) or agreed to in writing, shall any Contributor be
|
|
157
|
+
liable to You for damages, including any direct, indirect, special,
|
|
158
|
+
incidental, or consequential damages of any character arising as a
|
|
159
|
+
result of this License or out of the use or inability to use the
|
|
160
|
+
Work (including but not limited to damages for loss of goodwill,
|
|
161
|
+
work stoppage, computer failure or malfunction, or any and all
|
|
162
|
+
other commercial damages or losses), even if such Contributor
|
|
163
|
+
has been advised of the possibility of such damages.
|
|
164
|
+
|
|
165
|
+
9. Accepting Warranty or Additional Liability. While redistributing
|
|
166
|
+
the Work or Derivative Works thereof, You may choose to offer,
|
|
167
|
+
and charge a fee for, acceptance of support, warranty, indemnity,
|
|
168
|
+
or other liability obligations and/or rights consistent with this
|
|
169
|
+
License. However, in accepting such obligations, You may act only
|
|
170
|
+
on Your own behalf and on Your sole responsibility, not on behalf
|
|
171
|
+
of any other Contributor, and only if You agree to indemnify,
|
|
172
|
+
defend, and hold each Contributor harmless for any liability
|
|
173
|
+
incurred by, or claims asserted against, such Contributor by reason
|
|
174
|
+
of your accepting any such warranty or additional liability.
|
|
175
|
+
|
|
176
|
+
END OF TERMS AND CONDITIONS
|
|
177
|
+
|
|
178
|
+
APPENDIX: How to apply the Apache License to your work.
|
|
179
|
+
|
|
180
|
+
To apply the Apache License to your work, attach the following
|
|
181
|
+
boilerplate notice, with the fields enclosed by brackets "{}"
|
|
182
|
+
replaced with your own identifying information. (Don't include
|
|
183
|
+
the brackets!) The text should be enclosed in the appropriate
|
|
184
|
+
comment syntax for the file format. We also recommend that a
|
|
185
|
+
file or class name and description of purpose be included on the
|
|
186
|
+
same "printed page" as the copyright notice for easier
|
|
187
|
+
identification within third-party archives.
|
|
188
|
+
|
|
189
|
+
Copyright 2024 Province of British Columbia
|
|
190
|
+
|
|
191
|
+
Licensed under the Apache License, Version 2.0 (the "License");
|
|
192
|
+
you may not use this file except in compliance with the License.
|
|
193
|
+
You may obtain a copy of the License at
|
|
194
|
+
|
|
195
|
+
http://www.apache.org/licenses/LICENSE-2.0
|
|
196
|
+
|
|
197
|
+
Unless required by applicable law or agreed to in writing, software
|
|
198
|
+
distributed under the License is distributed on an "AS IS" BASIS,
|
|
199
|
+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
200
|
+
See the License for the specific language governing permissions and
|
|
201
|
+
limitations under the License.
|
|
@@ -0,0 +1,301 @@
|
|
|
1
|
+
Metadata-Version: 2.4
|
|
2
|
+
Name: fit_changedetector
|
|
3
|
+
Version: 0.1.0a1
|
|
4
|
+
Summary: Compare geo-data, report on diffs
|
|
5
|
+
Author-email: Simon Norris <snorris@hillcrestgeo.ca>
|
|
6
|
+
Project-URL: Homepage, https://github.com/bcgov/fit_changedetector
|
|
7
|
+
Project-URL: Issues, https://github.com/bcgov/fit_changedetector
|
|
8
|
+
Classifier: Development Status :: 1 - Planning
|
|
9
|
+
Classifier: Programming Language :: Python :: 3.10
|
|
10
|
+
Classifier: Programming Language :: Python :: 3.11
|
|
11
|
+
Classifier: Programming Language :: Python :: 3.12
|
|
12
|
+
Classifier: License :: OSI Approved :: Apache Software License
|
|
13
|
+
Classifier: Topic :: Scientific/Engineering :: GIS
|
|
14
|
+
Classifier: Operating System :: OS Independent
|
|
15
|
+
Requires-Python: >=3.10
|
|
16
|
+
Description-Content-Type: text/markdown
|
|
17
|
+
License-File: LICENSE
|
|
18
|
+
Requires-Dist: click
|
|
19
|
+
Requires-Dist: cligj
|
|
20
|
+
Requires-Dist: geopandas>=1.0.0
|
|
21
|
+
Requires-Dist: pyarrow
|
|
22
|
+
Provides-Extra: test
|
|
23
|
+
Requires-Dist: pytest; extra == "test"
|
|
24
|
+
Requires-Dist: build; extra == "test"
|
|
25
|
+
Requires-Dist: pre-commit; extra == "test"
|
|
26
|
+
Dynamic: license-file
|
|
27
|
+
|
|
28
|
+
# FIT Change Detector
|
|
29
|
+
|
|
30
|
+
[](https://github.com/bcgov/repomountie/blob/master/doc/lifecycle-badges.md)
|
|
31
|
+
|
|
32
|
+
Compare two sets of geo-data and report on the differences.
|
|
33
|
+
|
|
34
|
+
## Installation
|
|
35
|
+
|
|
36
|
+
Install with pip:
|
|
37
|
+
|
|
38
|
+
pip install fit_changedetector
|
|
39
|
+
|
|
40
|
+
An ArcGIS Pro script tool is also provided (`arcgis.py`).
|
|
41
|
+
Because an ArcGIS managed conda environment is unlikely to be 100% compatible with this module's dependencies, installation of this module to a virtual environment is recommended:
|
|
42
|
+
|
|
43
|
+
In a Windows Command Prompt (with no active conda environment):
|
|
44
|
+
|
|
45
|
+
python -m venv .venv
|
|
46
|
+
.venv\Scripts\activate.bat
|
|
47
|
+
pip install fit_changedetector
|
|
48
|
+
|
|
49
|
+
Set the `FIT_CHANGEDETECTOR_VENV_PYTHON` environment variable to the path of `python.exe` in your virtual environment (e.g. via `setx FIT_CHANGEDETECTOR_VENV_PYTHON "C:\path\to\.venv\Scripts\python.exe"`, or through Windows' System Properties > Environment Variables), then drop `arcgis.py` into your ArcGIS toolbox. If you don't have permission to set an environment variable, instead create a `venv_python.txt` file next to `arcgis.py` in the toolbox folder, containing just the path to `python.exe`. To avoid conflict with the system Python, the script tool passes the arguments provided in the ArcGIS tool to the change detector CLI - which is run in a subprocess using the virtual environment's Python.
|
|
50
|
+
|
|
51
|
+
|
|
52
|
+
## Usage
|
|
53
|
+
|
|
54
|
+
#### Python module
|
|
55
|
+
|
|
56
|
+
The primary function of interest is `gdf_diff()`:
|
|
57
|
+
|
|
58
|
+
import geopandas
|
|
59
|
+
import fit_changedetector as fcd
|
|
60
|
+
|
|
61
|
+
# read the data
|
|
62
|
+
df_a = geopandas.read_file(in_file_a, layer=layer_a)
|
|
63
|
+
df_b = geopandas.read_file(in_file_b, layer=layer_b)
|
|
64
|
+
|
|
65
|
+
# compare the two dataframes
|
|
66
|
+
diff = fcd.gdf_diff(
|
|
67
|
+
df_a,
|
|
68
|
+
df_b,
|
|
69
|
+
<primary_key>,
|
|
70
|
+
fields=<fields_to_compare>,
|
|
71
|
+
precision=<precision>,
|
|
72
|
+
suffix_a="a",
|
|
73
|
+
suffix_b="b",
|
|
74
|
+
)
|
|
75
|
+
|
|
76
|
+
`gdf_diff` returns a dictionary having the keys noted below. Dictionary values are geopandas GeoDataFrames holding the corresponding records.
|
|
77
|
+
|
|
78
|
+
Dictionary keys:
|
|
79
|
+
|
|
80
|
+
| key | description |
|
|
81
|
+
|-----|-------------|
|
|
82
|
+
| `NEW` | additions |
|
|
83
|
+
| `DELETED` | deleted records |
|
|
84
|
+
| `UNCHANGED` | unchanged records |
|
|
85
|
+
| `MODIFIED_BOTH` | records where attribute columns and geometries have changed |
|
|
86
|
+
| `MODIFIED_ATTR` | records where attribute columns have changed but geometries have not changed |
|
|
87
|
+
| `MODIFIED_GEOM` | records where geometries have changed but attribute columns have not |
|
|
88
|
+
| `DUPLICATES` | records dropped due to a duplicated primary key (only populated if `allow_duplicates=True`) |
|
|
89
|
+
|
|
90
|
+
Schemas for records contained in `NEW`, `DELETED`, `UNCHANGED` are as per the source data. `DUPLICATES` records retain their source schema too, plus a `_fcd_source_` column (`suffix_a`/`suffix_b`) identifying which source each record was dropped from.
|
|
91
|
+
Schemas for records contained in the `MODIFIED` keys include only columns where a change has occurred.
|
|
92
|
+
For example, these are some "modified attributes" records, with "_a" suffix for values from the primary dataset, and "_b" suffix for values from the secondary dataset:
|
|
93
|
+
|
|
94
|
+
>>> diff["MODIFIED_ATTR"]
|
|
95
|
+
id park_name_a park_name_b parkclasscode_a parkclasscode_b
|
|
96
|
+
0 3 Mars Street Park Jupiter Street Park NaN NaN
|
|
97
|
+
1 6 Mayfair Blue Mayfair Green BL GRN
|
|
98
|
+
2 7 Quadra Heights Playground NaN NaN
|
|
99
|
+
3 9 NaN NaN RP PND
|
|
100
|
+
|
|
101
|
+
|
|
102
|
+
#### CLI
|
|
103
|
+
|
|
104
|
+
<!-- BEGIN CLI HELP (auto-generated by scripts/update_cli_docs.py - do not edit by hand) -->
|
|
105
|
+
$ changedetector --help
|
|
106
|
+
Usage: changedetector [OPTIONS] COMMAND [ARGS]...
|
|
107
|
+
|
|
108
|
+
Options:
|
|
109
|
+
--version Show the version and exit.
|
|
110
|
+
--help Show this message and exit.
|
|
111
|
+
|
|
112
|
+
Commands:
|
|
113
|
+
add-hash-key Read input data, compute hash, write to new file
|
|
114
|
+
diff Compare two datasets, printing a JSON summary to stdout
|
|
115
|
+
diff2gdb Compare two datasets, writing results to .gdb
|
|
116
|
+
|
|
117
|
+
$ changedetector add-hash-key --help
|
|
118
|
+
Usage: changedetector add-hash-key [OPTIONS] IN_FILE OUT_FILE
|
|
119
|
+
|
|
120
|
+
Read input data, compute hash, write to new file
|
|
121
|
+
|
|
122
|
+
Options:
|
|
123
|
+
--in-layer TEXT Name of layer to add hashed primary key
|
|
124
|
+
-nln, --out-layer TEXT Output layer name
|
|
125
|
+
-hk, --hash-key TEXT Name of new column containing hashed data
|
|
126
|
+
-d, --drop-null-geometry Drop records with null geometry
|
|
127
|
+
-hf, --hash-fields TEXT Comma separated list of fields to include in the
|
|
128
|
+
hash (not including geometry)
|
|
129
|
+
-p, --precision FLOAT Coordinate precision for geometry hash and
|
|
130
|
+
comparison. Default=0.01
|
|
131
|
+
--crs TEXT Coordinate reference system to use when hashing
|
|
132
|
+
geometries (eg EPSG:3005)
|
|
133
|
+
-v, --verbose Increase verbosity.
|
|
134
|
+
-q, --quiet Decrease verbosity.
|
|
135
|
+
--help Show this message and exit.
|
|
136
|
+
|
|
137
|
+
$ changedetector diff --help
|
|
138
|
+
Usage: changedetector diff [OPTIONS] IN_FILE_A IN_FILE_B
|
|
139
|
+
|
|
140
|
+
Compare two datasets, printing a JSON summary to stdout
|
|
141
|
+
|
|
142
|
+
Same comparison as `diff2gdb`, but for when spatial output isn't needed -
|
|
143
|
+
prints a JSON summary instead of writing a .gdb: record counts per
|
|
144
|
+
NEW/DELETED/UNCHANGED/MODIFIED_* category, plus the primary key value(s)
|
|
145
|
+
present in each category (use --count to omit the key lists and print just the
|
|
146
|
+
counts).
|
|
147
|
+
|
|
148
|
+
IN_FILE_A may be "-" to read GeoJSON from stdin instead of a file.
|
|
149
|
+
|
|
150
|
+
Options:
|
|
151
|
+
--layer-a TEXT Name of layer to use within in_file_a (not valid if
|
|
152
|
+
reading from stdin/parquet)
|
|
153
|
+
--layer-b TEXT Name of layer to use within in_file_b (not valid if
|
|
154
|
+
reading from parquet)
|
|
155
|
+
-f, --fields TEXT Comma separated list of fields to compare (do not
|
|
156
|
+
include primary key)
|
|
157
|
+
-if, --ignore-fields TEXT Comma separated list of fields to ignore
|
|
158
|
+
-pk, --primary-key TEXT Comma separated list of primary key column(s),
|
|
159
|
+
common to both datasets
|
|
160
|
+
-hk, --hash-key TEXT Name of new column to add as hash key
|
|
161
|
+
-hf, --hash-fields TEXT Comma separated list of fields to include in the
|
|
162
|
+
hash (in addition to geometry)
|
|
163
|
+
-p, --precision FLOAT Coordinate precision for geometry hash and
|
|
164
|
+
comparison. Default=0.01
|
|
165
|
+
-a, --suffix-a TEXT Suffix to append to column names from data source A
|
|
166
|
+
when comparing attributes
|
|
167
|
+
-b, --suffix-b TEXT Suffix to append to column names from data source B
|
|
168
|
+
when comparing attributes
|
|
169
|
+
-d, --drop-null-geometry Drop records with null geometry
|
|
170
|
+
--crs TEXT Coordinate reference system to use when hashing
|
|
171
|
+
geometries (eg EPSG:3005)
|
|
172
|
+
-c, --count Print only record counts, omitting the primary key
|
|
173
|
+
values in each category
|
|
174
|
+
--allow-duplicates Do not fail on a duplicated primary key - instead,
|
|
175
|
+
drop all but the first occurrence of each
|
|
176
|
+
duplicated key from the source it was found in, and
|
|
177
|
+
include a DUPLICATES category in the output
|
|
178
|
+
-v, --verbose Increase verbosity.
|
|
179
|
+
-q, --quiet Decrease verbosity.
|
|
180
|
+
--help Show this message and exit.
|
|
181
|
+
|
|
182
|
+
$ changedetector diff2gdb --help
|
|
183
|
+
Usage: changedetector diff2gdb [OPTIONS] IN_FILE_A IN_FILE_B
|
|
184
|
+
|
|
185
|
+
Compare two datasets, writing results to .gdb
|
|
186
|
+
|
|
187
|
+
IN_FILE_A may be "-" to read GeoJSON from stdin instead of a file.
|
|
188
|
+
|
|
189
|
+
Options:
|
|
190
|
+
--layer-a TEXT Name of layer to use within in_file_a (not valid if
|
|
191
|
+
reading from stdin/parquet)
|
|
192
|
+
--layer-b TEXT Name of layer to use within in_file_b (not valid if
|
|
193
|
+
reading from parquet)
|
|
194
|
+
-f, --fields TEXT Comma separated list of fields to compare (do not
|
|
195
|
+
include primary key)
|
|
196
|
+
-if, --ignore-fields TEXT Comma separated list of fields to ignore
|
|
197
|
+
-o, --out-file PATH Path to output file, defaults to
|
|
198
|
+
./changedetector_YYYYMMDD_HHMM.gdb
|
|
199
|
+
-pk, --primary-key TEXT Comma separated list of primary key column(s),
|
|
200
|
+
common to both datasets
|
|
201
|
+
-hk, --hash-key TEXT Name of new column to add as hash key
|
|
202
|
+
-hf, --hash-fields TEXT Comma separated list of fields to include in the
|
|
203
|
+
hash (in addition to geometry)
|
|
204
|
+
-p, --precision FLOAT Coordinate precision for geometry hash and
|
|
205
|
+
comparison. Default=0.01
|
|
206
|
+
-a, --suffix-a TEXT Suffix to append to column names from data source A
|
|
207
|
+
when comparing attributes
|
|
208
|
+
-b, --suffix-b TEXT Suffix to append to column names from data source B
|
|
209
|
+
when comparing attributes
|
|
210
|
+
-d, --drop-null-geometry Drop records with null geometry
|
|
211
|
+
-i, --dump-inputs Dump input layers (with new hash key) to output
|
|
212
|
+
.gdb
|
|
213
|
+
--crs TEXT Coordinate reference system to use when hashing
|
|
214
|
+
geometries (eg EPSG:3005)
|
|
215
|
+
--allow-duplicates Do not fail on a duplicated primary key - instead,
|
|
216
|
+
drop all but the first occurrence of each
|
|
217
|
+
duplicated key from the source it was found in, and
|
|
218
|
+
write the dropped records to a DUPLICATES layer
|
|
219
|
+
-v, --verbose Increase verbosity.
|
|
220
|
+
-q, --quiet Decrease verbosity.
|
|
221
|
+
--help Show this message and exit.
|
|
222
|
+
<!-- END CLI HELP -->
|
|
223
|
+
|
|
224
|
+
##### Examples
|
|
225
|
+
|
|
226
|
+
Compare the test datasets using their known primary key:
|
|
227
|
+
|
|
228
|
+
$ changedetector diff2gdb -v \
|
|
229
|
+
tests/data/parks_a.geojson \
|
|
230
|
+
tests/data/parks_b.geojson \
|
|
231
|
+
-pk id
|
|
232
|
+
|
|
233
|
+
Compare the test datasets, using a hash of geometry and the column `park_name` as synthetic primary key, written to `new_hash_column`:
|
|
234
|
+
|
|
235
|
+
$ changedetector diff2gdb -v \
|
|
236
|
+
tests/data/parks_a.geojson \
|
|
237
|
+
tests/data/parks_b.geojson \
|
|
238
|
+
-hf park_name \
|
|
239
|
+
-hk new_hash_column
|
|
240
|
+
|
|
241
|
+
`IN_FILE_A` may be `-` to read GeoJSON from stdin instead of a file, e.g. to compare a database export against a file on disk without writing the export to disk first:
|
|
242
|
+
|
|
243
|
+
$ ogr2ogr -f GeoJSON /vsistdout/ PG:"dbname=mydb" -sql "SELECT * FROM my_table" | \
|
|
244
|
+
changedetector diff2gdb -v - tests/data/parks_b.geojson -pk id
|
|
245
|
+
|
|
246
|
+
`diff` prints record counts per category plus the primary key value(s) present in each by default; add `--count`/`-c` to print just the counts:
|
|
247
|
+
|
|
248
|
+
$ changedetector diff tests/data/parks_a.geojson tests/data/parks_b.geojson -pk id
|
|
249
|
+
{"NEW": 1, "DELETED": 1, "UNCHANGED": 1, "MODIFIED_BOTH": 1, "MODIFIED_ATTR": 4, "MODIFIED_GEOM": 1, "keys": {"NEW": ["8"], "DELETED": ["2"], "UNCHANGED": ["1"], "MODIFIED_BOTH": ["5"], "MODIFIED_ATTR": ["3", "6", "7", "9"], "MODIFIED_GEOM": ["4"]}}
|
|
250
|
+
|
|
251
|
+
$ changedetector diff tests/data/parks_a.geojson tests/data/parks_b.geojson -pk id --count
|
|
252
|
+
{"NEW": 1, "DELETED": 1, "UNCHANGED": 1, "MODIFIED_BOTH": 1, "MODIFIED_ATTR": 4, "MODIFIED_GEOM": 1}
|
|
253
|
+
|
|
254
|
+
##### Usage notes
|
|
255
|
+
|
|
256
|
+
Layer options are not valid for stdin and parquet sources - streams and parquet files have no concept of multiple layers.
|
|
257
|
+
|
|
258
|
+
A *partitioned* parquet dataset (a directory of many `.parquet` files) is not supported as a single source - `diff`/`diff2gdb` load an entire source into memory regardless of format, so there's no benefit to teaching them to read a partition directory as one dataset. Instead, run the command once per file, e.g. for two partitioned datasets with matching partition filenames:
|
|
259
|
+
|
|
260
|
+
$ for part in dataset_a/*.parquet; do
|
|
261
|
+
name=$(basename "$part" .parquet)
|
|
262
|
+
changedetector diff2gdb -v \
|
|
263
|
+
"$part" \
|
|
264
|
+
"dataset_b/${name}.parquet" \
|
|
265
|
+
-pk id \
|
|
266
|
+
-o "output_${name}.gdb"
|
|
267
|
+
done
|
|
268
|
+
|
|
269
|
+
Neither `diff` nor `diff2gdb` have a bounding box / spatial filtering option, and won't - applying a bbox filter independently to each source risks reporting spurious `NEW`/`DELETED` records for anything that moved across the boundary between the two snapshots being compared, rather than genuinely appearing/disappearing from the source. Filter with another tool first, e.g.:
|
|
270
|
+
|
|
271
|
+
$ ogr2ogr -f GeoJSON /vsistdout/ dataset_a.gpkg -spat 1150000 470000 1200000 500000 | \
|
|
272
|
+
changedetector diff2gdb -v - dataset_b.gpkg -pk id
|
|
273
|
+
|
|
274
|
+
|
|
275
|
+
#### ArcGIS
|
|
276
|
+
|
|
277
|
+
The script tool calls the above documented CLI. Documentation of the parameters is also provided within the ArcGIS interface.
|
|
278
|
+
|
|
279
|
+
## Subtleties to geometry change detection
|
|
280
|
+
|
|
281
|
+
Prior to comparing geometries, the tool will:
|
|
282
|
+
|
|
283
|
+
- normalize geometries (vertex order/starting point or ring winding direction)
|
|
284
|
+
- promote mixed single/multipart types to multipart (when a source contains both variants — a uniformly single-part source compared against a uniformly multi-part source will still raise a type mismatch)
|
|
285
|
+
- apply coordinate precision tolerance (`-p`/`--precision`, default 0.01)
|
|
286
|
+
|
|
287
|
+
On the other hand, a new vertex in an otherwise unchanged geometry will be considered as MODIFIED_GEOM.
|
|
288
|
+
See geopandas [geom_equals_exact](https://geopandas.org/en/stable/docs/reference/api/geopandas.GeoSeries.geom_equals_exact.html) for details.
|
|
289
|
+
|
|
290
|
+
Curved geometry types (`CIRCULARSTRING`, `COMPOUNDCURVE`, `CURVEPOLYGON`, etc, as found in some `.gdb` sources) are not supported - only `POINT`, `LINESTRING`, `POLYGON` and their `MULTI*` equivalents are ([#66](https://github.com/bcgov/FIT_changedetector/issues/66)). GDAL segments curves into their linear approximation on read, so a curved source may appear to work, but the precision of that approximation is not controlled by `diff`/`diff2gdb` and results involving curved input should not be relied on.
|
|
291
|
+
|
|
292
|
+
|
|
293
|
+
|
|
294
|
+
## Development and testing
|
|
295
|
+
|
|
296
|
+
Uses [uv](https://docs.astral.sh/uv/) for dependency management:
|
|
297
|
+
|
|
298
|
+
$ git clone git@github.com:bcgov/FIT_changedetector.git
|
|
299
|
+
$ cd FIT_changedetector
|
|
300
|
+
$ uv sync --extra test
|
|
301
|
+
$ uv run pytest
|