Wykres commitów

490 Commity (b07707cc22d535acca47c2556aa269f71cadfa55)

Autor SHA1 Wiadomość Data
Taylor Smock 2fe054e3ad
Add snapshot update sites for branches
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-03 16:32:02 -06:00
Taylor Smock a958a8f04d
Improve Download UI panel
* Remove favorites (no longer implementing), start trying to highlight
  relevant entries based off of mapview location.
* Hide the active layer table in download options
* Add deactivate/activate UI functionality
* Modify table so that rows can be removed.
  * This is so that we don't have duplicate columns in smaller views (e.g.
    Preferences).
* This also modifies column widths to better match string widths. This
  will most likely need to be modified.
* Have the map/list use more space
* Hide URL field in download window
* Highlight name field in download window
* Add a column for source provider information

Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-03 16:32:02 -06:00
Taylor Smock a8d60a9820
Update dependencies
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-03 16:32:01 -06:00
Taylor Smock 21d5c6b477
Spotbugs, errorprone fixes
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-03 16:32:01 -06:00
Taylor Smock c8d1bba766
Add compile/runtime paths for integration tests
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-03 16:32:01 -06:00
Taylor Smock 222c4bb12b
Add tests for parsing esri feature servers
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-03 16:32:01 -06:00
Taylor Smock e548bdd3c3
Use streams, add check to avoid NPE, and default to OTHER as a type.
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-03 16:32:01 -06:00
Taylor Smock 1277c00ee1
Use assertThrows instead of ExpectedException
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-03 16:32:01 -06:00
Taylor Smock 38c0bbeaaf
Set java versions in build.gradle
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-03 16:32:01 -06:00
Taylor Smock b01b89e0d5
Add tests for MapWithAIInfo and MapWithAISourceReader
There is now an integration test directory, which is specifically for
any tests that may call an exterior server (i.e., mapwith.ai).

Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-03 16:32:00 -06:00
Taylor Smock 4c15c59df5
Use layer to set download listeners for continuous download
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-03 16:32:00 -06:00
Taylor Smock 588508b73f
Only perform deduplication on highways, not buildings
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-03 16:32:00 -06:00
Taylor Smock b7441fa7bd
Work on highlighting sources inside bounding box and zooming to the appropriate location based off of other panels
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-03 16:32:00 -06:00
Taylor Smock 1aad1f67e9
Add advanced preference to avoid conflation for third-party sources
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-03 16:32:00 -06:00
beata.tautan 328f3b96b1
ESRI branch 2020-06-03 16:32:00 -06:00
Taylor Smock 50556cab86
Use "" instead of null (avoid NPE)
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-03 16:31:59 -06:00
Taylor Smock 7e1d5ce7e1
Modify task to save downloaded data
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-03 16:31:59 -06:00
Taylor Smock 6ebd79a1b1
Add a fuzzy match for categories
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-03 16:31:59 -06:00
Taylor Smock de3141ff90
Set an image as optional (due to Eclipse not having it...)
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-03 16:31:58 -06:00
Taylor Smock 25c378ea34
Add WindowMockers (now required due to a dependency from MapWithAIDownloadOptions)
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-03 16:31:56 -06:00
Taylor Smock e1acbc7ea3
Only keep editable fields, but assume that a field is editable if the property does not exist
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-03 16:31:55 -06:00
Taylor Smock 46ff076402
Modify test so that it only counts paint styles with MapWithAI in the title (name)
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-03 16:31:53 -06:00
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