Wykres commitów

346 Commity (db7089e40668dccc9f0f0d2c8c70ea92f47c4018)

Autor SHA1 Wiadomość Data
Taylor Smock db7089e406
Enable/disable download based off of user interactions in the layer panel
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-18 14:52:40 -06:00
Taylor Smock 7fab30e4d0
Carry status of sources between download and preferences panel
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-18 14:21:04 -06:00
Taylor Smock c5cb23a17b
Add code to not conflate certain sources, when necessary
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-16 10:31:04 -06:00
Taylor Smock 8b3cd6866d
Remove OsmReaderCustom, since JOSM should now have similar functionality
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-16 07:28:29 -06:00
Taylor Smock dd46b1562a
Read categories from sources.json
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-15 17:20:12 -06:00
Taylor Smock 462a3db5d8
Update for changes in JOSM r16641
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-15 07:58:45 -06:00
Taylor Smock 5757be5221
Split complex method section into its own method
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-12 09:04:19 -06:00
Taylor Smock a54e21a1c9
Add methods to hide already conflated data
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-12 09:04:19 -06:00
Taylor Smock 19a697692b
Prefer `source` over `mapwithai:source` for changeset source
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-11 16:23:20 -06:00
Taylor Smock d64aed9270
Various documentation fixes and Entry -> Map.Entry
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-11 14:21:50 -06:00
Taylor Smock f6f3d256d7
Fix some new errorprone warnings
Mostly javadoc related, but one (useless) method was entirely removed.

Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-10 17:03:21 -06:00
Taylor Smock cde1e3f60a
Split some classes into their own files and fix some sonarlint issues.
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-10 16:31:44 -06:00
Taylor Smock eac9329a58
Modify visibility for several classes, add some missing javadoc
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-10 12:54:53 -06:00
Taylor Smock 281736e0ec
Remove MapWithAIDownloadReader
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-10 11:06:50 -06:00
Taylor Smock c18ee6ba33
StubEndsTest: Clarify double-initialization of maxLength, fix some sonarlint issues
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-10 10:36:57 -06:00
Taylor Smock f29d5d53c5
OsmReaderCustom: Move to IO package
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-10 10:28:25 -06:00
Taylor Smock bbfc1d8676
MapWithAIProvidersPanel: Partial refactor
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-10 10:28:25 -06:00
Taylor Smock bd9fd19126
GetDataRunnable: Partial refactor
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-10 10:14:21 -06:00
Taylor Smock 6c8e05c5cb
DownloadMapWithAITask: public -> package visibility
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-10 10:14:21 -06:00
Taylor Smock 7c4913d09c
DetectTaskingManagerUtils: public -> package visibility
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-10 10:14:20 -06:00
Taylor Smock a3334f4562
DataAvailaibility: Clean up some sonarlint warnings
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-10 10:14:20 -06:00
Taylor Smock a69320487f
BoundingBoxDownloader: public -> package visibility
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-10 10:14:20 -06:00
Taylor Smock 49cd56742c
Fix an issue where Lists are not read by StructUtils
The fix was switching to a string which is joined/split.
This fixes #78.

Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-10 09:39:30 -06:00
Taylor Smock 8538c48a11
Allow for multiple categories in MapWithAIInfo
This fixes #73.

Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-09 16:58:24 -06:00
Taylor Smock 79dfccec3d
GuiHelper.runInEDT -> GuiHelper.runInEDTAndWait when getting MapWithAI Layer
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-09 12:20:51 -06:00
Taylor Smock e06b824d98
Modify MapWithAIInfo to extend appropriate classes
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-09 12:20:51 -06:00
Taylor Smock 791ac9e42b
Save MapWithAI layers to download when modified in download window
This fixes #77.

Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-05 08:45:37 -06:00
Taylor Smock a53a79dbdb
FIXUP: Avoid a ConcurrentModificationException (fixes #74)
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-04 16:25:31 -06:00
Taylor Smock 73d67c7a0a
FIXUP: a958a8f0 had two sorted in a row.
The intent of the first sorted was to reverse the order, which the
second sorted undid.

Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-04 16:25:31 -06:00
Taylor Smock fac63ccbf9
Add notification when no MapWithAI layers are selected
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-04 16:25:31 -06:00
Taylor Smock 6efbd64625
Fix a probable deadlock
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-04 16:25:31 -06:00
Taylor Smock 0b10f3f927
Better replacement tag handling
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-04 16:25:30 -06:00
Taylor Smock 60b99acef9
Extract ESRI server reader to separate file
* Also add source provider information
* Update pjson -> json (the latter is slightly more efficient)

Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-03 17:07:47 -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 21d5c6b477
Spotbugs, errorprone fixes
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 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 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 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