Taylor Smock
67f408476a
Fix a test that has issues if other tests have added urls
...
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-03 16:31:52 -06:00
Taylor Smock
0510b11d77
Bump JOSM version
...
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-03 16:31:51 -06:00
Taylor Smock
36223efe5d
Add fields for conflation information
...
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-03 16:31:50 -06:00
Taylor Smock
d7fe108f1f
Initial implementation for setting sources in download
...
* Add checkbox to main UI download panel
* For more information, see JOSM-18340
* There have been some modifications so that both JOSM UI panel download
methods use the same class to download.
* Reuse panel from preferences for setting sources
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-03 16:31:48 -06:00
Taylor Smock
94414ea1b6
Move Download Window for MapWithAI to appropriate location
...
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-03 16:31:47 -06:00
Taylor Smock
9e48553b1d
More thorough testing for the upload hook
...
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-03 16:31:46 -06:00
Taylor Smock
0aa1672659
Add explicit test for the status line object feedback
...
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-03 16:31:45 -06:00
Taylor Smock
072a839e05
Ensure that we are only using wiremock mappings when a test uses wiremock
...
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-03 16:31:44 -06:00
Taylor Smock
5d883d8fd4
Create a special third-party case for ESRI servers
...
This currently supports groups (the id in the sources.json *must* be the
group id) and specific FeatureServers.
This should only be used when (a) permission is given for OpenStreetMap
to use the data and (b) the server owner has given their OK. While the
feature calls should be as efficient as possible, many server owners
will be paying for data transfer.
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-03 16:31:42 -06:00
Taylor Smock
dee0b13fc7
Update to a non-deprecated method to determine network connectivity
...
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-05-20 13:57:47 -06:00
Taylor Smock
e5897da7f7
Don't try to download data from sources that do not cover the current area
...
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-05-20 13:57:47 -06:00
Taylor Smock
d96100c67d
Actually read type from geojson and the id
...
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-05-20 13:57:47 -06:00
Taylor Smock
0a3bf38cb8
Allow users to select a specific type for a MapWithAIInfo
...
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-05-20 13:57:47 -06:00
Taylor Smock
2e154775b8
Add parameter to prevent editing of necessary parameters
...
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-05-20 13:57:47 -06:00
Taylor Smock
b0193ac2e1
Add default replacement tags for servers
...
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-05-20 13:57:47 -06:00
Taylor Smock
7726f2aff2
Allow xmin/xmax/ymin/ymax instead of bbox in URLs
...
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-05-20 13:57:46 -06:00
Taylor Smock
b23eef2302
Add method to remove empty keys/tags
...
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-05-20 13:57:46 -06:00
Taylor Smock
dc01291420
Update Gradle and another dependency
...
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-05-15 07:14:03 -06:00
Taylor Smock
36651d26a2
Fix some errors
...
* An NPE could occur if the assigned fix was null.
* No longer allow negative ids for connections (SimplePrimitiveId
doesn't allow for negative ids)
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-05-14 15:10:11 -06:00
Taylor Smock
c7422e7dcf
Better client-side conflation
...
Instead of performing missing conflation in a parallel code path, we now
add the appropriate tags prior to the rest of the conflation taking
place.
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-05-14 11:19:39 -06:00
Taylor Smock
dd62a45a1e
Add a fix ways that don't cross other ways, but should be connected
...
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-05-13 10:09:36 -06:00
Taylor Smock
c8f02af243
FIXUP: Don't add test dependencies from ivy in release jar
...
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-05-13 10:09:35 -06:00
Taylor Smock
3813ece2a2
Update paint style
...
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-05-13 08:50:49 -06:00
Taylor Smock
779c862cea
Add a check and cleanup for overnoded ways
...
Also switch layers to the appropriate data layer (for UI) for
OverNodedWays/MissingConnectionTags.
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-05-12 16:13:37 -06:00
Taylor Smock
3d43ee1434
Fix some tests, and ensure that they are reliably passing/failing (i.e., not due to a missing mock)
...
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-05-12 14:59:00 -06:00
Taylor Smock
c3143a056a
Detect potential missing connection tags, and offer to add the appropriate connection
...
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-05-12 10:40:31 -06:00
Taylor Smock
bc2a7fa195
Update dependencies
...
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-05-12 10:40:31 -06:00
Taylor Smock
d7dcd1d0ef
Update paint style to match version on website
...
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-05-08 08:58:12 -06:00
Taylor Smock
c95d4cf509
Add debugPort in gradle, and ivyde for Eclipse
...
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-05-08 08:58:12 -06:00
Taylor Smock
d52ba178f5
Try to detect when download area is too large (from server response), and try again
...
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-05-08 08:58:12 -06:00
Taylor Smock
8637ca6f96
Allow MapWithAI actions to be assigned to the toolbar
...
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-05-05 15:06:15 -06:00
Taylor Smock
a8d8c6b48d
Update messages
...
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-04-23 12:53:04 -06:00
Taylor Smock
5b68e077d2
Update message
...
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-04-23 12:09:10 -06:00
Taylor Smock
286b7ad674
Attempt to auto populate the MapWithAI default servers
...
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-04-23 11:45:30 -06:00
Taylor Smock
fd6f3c5087
Continuing to try to fix a broken test
...
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-04-23 08:58:06 -06:00
Taylor Smock
0ea5f6972c
Update old version
...
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-04-23 08:44:50 -06:00
Taylor Smock
9441874507
Update message for missing URLs
...
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-04-23 07:16:59 -06:00
Taylor Smock
6ceae5095a
Work on investigating failing test
...
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-04-22 17:35:32 -06:00
Taylor Smock
0325f512e5
Update build dependencies
...
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-04-22 17:34:55 -06:00
Taylor Smock
0d74c70f88
Force assertions in EDT to show up
...
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-04-22 14:11:36 -06:00
Taylor Smock
fca3d1932a
More testing work
...
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-04-22 12:45:31 -06:00
Taylor Smock
03681c6f16
Add a new unit test for continuous downloads
...
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-04-22 08:15:16 -06:00
Taylor Smock
e3197bb6da
Apply a workaround for JOSM-19132
...
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-04-22 07:10:35 -06:00
Taylor Smock
0f18d8c9d7
Checkstyle/PMD
...
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-04-21 17:05:37 -06:00
Taylor Smock
fea93b59ad
Fix some unit tests
...
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-04-21 16:57:13 -06:00
Taylor Smock
9e80b4fa63
Add formatting file for spotless (follows JOSM's rules)
...
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-04-21 13:17:35 -06:00
Taylor Smock
ddcf69001b
Fix an NPE caused by Territories in JOSM
...
Also add spotless for code formatting
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-04-21 11:48:50 -06:00
Taylor Smock
96294ec888
Simplify some code for getting available data types
...
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-04-20 17:17:49 -06:00
Taylor Smock
abdf13b101
Use the JOSM Pair instead of Apache Commons Pair
...
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-04-20 11:29:13 -06:00
Taylor Smock
69f4252085
JOSM r16321 removed `Territories.getDataSet`
...
Switch to `Territories.getOriginalDataSet`
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-04-20 11:17:31 -06:00