Commit 2e53be6
ThijsMac
[app] Wire JTSTestBuilder to use CurvedWKTReader / CurvedGeometryFactory
Phase 4-A of the SFA / ISO 19125-2 curve work (per discussion #1193).
Single-purpose change: every WKT-parsing path inside jts-app now uses
the curve-aware reader and factory, so curved WKT can be pasted, loaded,
saved, and round-tripped without any new UI.
What now works in JTSTestBuilder
- Pasting `CIRCULARSTRING(1 5, 6 2, 7 3)` (or COMPOUNDCURVE,
CURVEPOLYGON, MULTICURVE, MULTISURFACE, TRIANGLE, POLYHEDRALSURFACE,
TIN, with optional Z/M/ZM modifiers) into the Input A/B panels.
- Loading a `.jts` test case that contains curved WKT.
- Loading WKT/WKB files via File menu.
- The Geometry tree shows the correct type name (CircularString, etc.).
- Spatial functions fall through to the parent type's behaviour
(polyline / polygon) per the phase-1 contract; explicit linearisation
is available via Linearizable.toLinear(tolerance).
Files touched (all jts-app)
- pom.xml: add jts-curved dependency.
- testbuilder/JTSTestBuilder.java: fallback geometry factory is now
CurvedGeometryFactory.
- testbuilder/model/TestBuilderModel.java: default geometry factory is
CurvedGeometryFactory; loadGeometryText and the post-precision-model-
change reload path use CurvedWKTReader / CurvedGeometryFactory.
- testbuilder/GeometryInputDialog.java: input parser uses the curved
reader / factory.
- util/io/IOUtil.java: readWKTString uses CurvedWKTReader (this is the
central WKT path, also reached via MultiFormatReader).
- util/io/MultiFormatBufferedReader.java: readWKT uses CurvedWKTReader.
- util/io/MultiFormatFileReader.java: readWKTFile uses CurvedWKTReader.
- test/TestCase.java: initGeometry and toNullOrGeometry use
CurvedWKTReader / CurvedGeometryFactory for test-case WKT parsing.
What is intentionally NOT in this commit
- No drawing tools for curved geometries (defer to Phase 4-B).
- No CurvedShapeWriter / Bezier rendering (defer to Phase 4-B).
- No GeometryType enum extension or controller mode methods.
Net diff: +30 / -15 lines across 8 files. Reactor build is green
(jts-core 2288 + jts-curved 54 tests pass; all other modules unchanged).1 parent f2f31a0 commit 2e53be6
8 files changed
Lines changed: 30 additions & 15 deletions
File tree
- modules/app
- src/main/java/org/locationtech/jtstest
- testbuilder
- model
- test
- util/io
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
15 | 15 | | |
16 | 16 | | |
17 | 17 | | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
18 | 23 | | |
19 | 24 | | |
20 | 25 | | |
| |||
Lines changed: 6 additions & 4 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
15 | 15 | | |
16 | 16 | | |
17 | 17 | | |
| 18 | + | |
18 | 19 | | |
19 | 20 | | |
| 21 | + | |
20 | 22 | | |
21 | 23 | | |
22 | 24 | | |
| |||
294 | 296 | | |
295 | 297 | | |
296 | 298 | | |
297 | | - | |
298 | | - | |
| 299 | + | |
| 300 | + | |
299 | 301 | | |
300 | 302 | | |
301 | 303 | | |
| |||
350 | 352 | | |
351 | 353 | | |
352 | 354 | | |
353 | | - | |
354 | | - | |
| 355 | + | |
| 356 | + | |
355 | 357 | | |
356 | 358 | | |
357 | 359 | | |
| |||
Lines changed: 4 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
30 | 30 | | |
31 | 31 | | |
32 | 32 | | |
| 33 | + | |
33 | 34 | | |
| 35 | + | |
34 | 36 | | |
35 | 37 | | |
36 | 38 | | |
| |||
221 | 223 | | |
222 | 224 | | |
223 | 225 | | |
224 | | - | |
225 | | - | |
| 226 | + | |
| 227 | + | |
226 | 228 | | |
227 | 229 | | |
228 | 230 | | |
| |||
Lines changed: 3 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
18 | 18 | | |
19 | 19 | | |
20 | 20 | | |
| 21 | + | |
21 | 22 | | |
22 | 23 | | |
23 | 24 | | |
| |||
80 | 81 | | |
81 | 82 | | |
82 | 83 | | |
83 | | - | |
84 | | - | |
| 84 | + | |
| 85 | + | |
85 | 86 | | |
86 | 87 | | |
87 | 88 | | |
| |||
Lines changed: 5 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
23 | 23 | | |
24 | 24 | | |
25 | 25 | | |
| 26 | + | |
26 | 27 | | |
27 | 28 | | |
28 | 29 | | |
| 30 | + | |
29 | 31 | | |
30 | 32 | | |
31 | 33 | | |
| |||
78 | 80 | | |
79 | 81 | | |
80 | 82 | | |
81 | | - | |
| 83 | + | |
82 | 84 | | |
83 | 85 | | |
84 | 86 | | |
| |||
240 | 242 | | |
241 | 243 | | |
242 | 244 | | |
243 | | - | |
| 245 | + | |
244 | 246 | | |
245 | 247 | | |
246 | 248 | | |
| |||
455 | 457 | | |
456 | 458 | | |
457 | 459 | | |
458 | | - | |
| 460 | + | |
459 | 461 | | |
460 | 462 | | |
461 | 463 | | |
| |||
Lines changed: 2 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
26 | 26 | | |
27 | 27 | | |
28 | 28 | | |
| 29 | + | |
29 | 30 | | |
30 | 31 | | |
31 | 32 | | |
| |||
117 | 118 | | |
118 | 119 | | |
119 | 120 | | |
120 | | - | |
| 121 | + | |
121 | 122 | | |
122 | 123 | | |
123 | 124 | | |
| |||
Lines changed: 3 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
23 | 23 | | |
24 | 24 | | |
25 | 25 | | |
| 26 | + | |
26 | 27 | | |
27 | 28 | | |
28 | 29 | | |
| |||
106 | 107 | | |
107 | 108 | | |
108 | 109 | | |
109 | | - | |
| 110 | + | |
110 | 111 | | |
111 | | - | |
| 112 | + | |
112 | 113 | | |
113 | 114 | | |
114 | 115 | | |
| |||
Lines changed: 2 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
23 | 23 | | |
24 | 24 | | |
25 | 25 | | |
| 26 | + | |
26 | 27 | | |
27 | 28 | | |
28 | 29 | | |
| |||
139 | 140 | | |
140 | 141 | | |
141 | 142 | | |
142 | | - | |
| 143 | + | |
143 | 144 | | |
144 | 145 | | |
145 | 146 | | |
| |||
0 commit comments