99f4de5dd4
Rework URL handling
...
Signed-off-by: Taylor Smock <tsmock@fb.com>
2021-11-10 11:24:10 -07:00
8c80790127
MergeAddressBuildings: fix a lint/best practices issue
...
Signed-off-by: Taylor Smock <tsmock@fb.com>
2021-11-09 10:14:28 -07:00
0ea652f46d
MergeAddressBuildings: Consider any node with an `addr:` tag to be an address node
...
Signed-off-by: Taylor Smock <tsmock@fb.com>
2021-11-09 10:12:47 -07:00
290aec3f1e
Include nodes with "addr:postcode" as address nodes
2021-11-05 23:47:05 +00:00
bc5fb4c0ff
Fix JOSM #21455 : Merge Address Nodes and Buildings not saving
...
Signed-off-by: Taylor Smock <tsmock@fb.com>
2021-10-20 16:09:16 -06:00
20d58f018a
ESRISourceReader: Fix permission issue when run under webstart
...
Signed-off-by: Taylor Smock <tsmock@fb.com>
2021-10-20 06:39:56 -06:00
d47b59161b
Work around JOSM bug in CachedFile#clear
...
Signed-off-by: Taylor Smock <tsmock@fb.com>
2021-10-19 07:44:26 -06:00
5930bda453
MapWithAILayerInfo: Fix typo
...
Call was to NetworkManager#isOffline, but was stored in a variable named
"online". Fix: Invert the returned boolean from NetworkManager#isOffline
Signed-off-by: Taylor Smock <tsmock@fb.com>
2021-10-19 07:16:45 -06:00
453ceb38b9
MapWithAILayerInfo: Fix CME
...
Signed-off-by: Taylor Smock <tsmock@fb.com>
2021-10-18 14:30:57 -06:00
ef13fd97d4
EsriSourceReader: Lazily load replacement tags
...
Signed-off-by: Taylor Smock <tsmock@fb.com>
2021-10-18 12:02:00 -06:00
810831af37
GetDataRunnable: Fix race condition where creation of two dataset might attempt to increment primitive id backward
...
Signed-off-by: Taylor Smock <tsmock@fb.com>
2021-09-30 16:25:38 -06:00
849f571837
Lint: Cleanup warnings on build
...
Signed-off-by: Taylor Smock <tsmock@fb.com>
2021-09-30 14:54:21 -06:00
5cb5262128
MapWithAI SourceReaders: Create common class for deduplication
...
Also ensure that users can ignore cache for MapWithAI sources.
Signed-off-by: Taylor Smock <tsmock@fb.com>
2021-09-30 14:54:21 -06:00
1d2859c1c5
MapPaintUtils: Add `,` to regex for replacement with `_`
...
Signed-off-by: Taylor Smock <tsmock@fb.com>
2021-09-30 14:54:21 -06:00
a23e94be0d
Tests: Better test isolation
...
Signed-off-by: Taylor Smock <tsmock@fb.com>
2021-09-08 06:06:14 -06:00
a0ed7272aa
Gradle: Dependency updates + fix for errorprone
...
Signed-off-by: Taylor Smock <tsmock@fb.com>
2021-09-07 08:30:42 -06:00
e092718f2f
RoutingIslands: Add highway=platform to exclusions
...
See https://wiki.openstreetmap.org/wiki/Tag:highway%3Dplatform for tag
information.
Signed-off-by: Taylor Smock <tsmock@fb.com>
2021-09-07 08:22:55 -06:00
16feefa1c4
MapWithAISourceReader: set provider
...
Signed-off-by: Taylor Smock <tsmock@fb.com>
2021-07-20 14:53:47 -06:00
f9308da42f
MapWithAILayerInfo: Sort all entries
...
Signed-off-by: Taylor Smock <tsmock@fb.com>
2021-07-20 14:12:49 -06:00
a4ab60cbe3
MapWithAISourceReader: Account for multiple categories
...
Signed-off-by: Taylor Smock <tsmock@fb.com>
2021-07-20 13:59:39 -06:00
d8fdc1683f
MapWithAIProvidersPanel: Avoid index error when clicking outside of table
...
Signed-off-by: Taylor Smock <tsmock@fb.com>
2021-07-20 13:58:15 -06:00
0aaa1b6ba7
MapWithAIProvidersPanel: Avoid setting final static field to final field
...
Signed-off-by: Taylor Smock <tsmock@fb.com>
2021-07-20 12:12:52 -06:00
b00a35b953
ESRISourceReader: Increase initial search, some perf optimizations
...
Signed-off-by: Taylor Smock <tsmock@fb.com>
2021-07-20 12:12:52 -06:00
5ea5ab9b04
ESRISourceReader: Sort by name, by featured, and then by general category
...
Signed-off-by: Taylor Smock <tsmock@fb.com>
2021-07-20 07:55:51 -06:00
596efa1982
ESRISourceReader: Allow for variable max ages
...
This means that the base ESRI collection urls will be updated more often
(with default settings, every day if JOSM is restarted), while the
specific feature server information urls will be updated weekly (again,
with default settings).
This uses the advanced preference `mirror.maxtime`, which is also used
by CachedFile.
We therefore recommend that anyone thinking about changing
`mirror.maxtime` to for faster updates for the ESRI feature server
collection url to *not* set that value to be less than `14400` (4
hours). This is to avoid hitting public servers too often.
Signed-off-by: Taylor Smock <tsmock@fb.com>
2021-07-01 08:27:05 -06:00
7bfffa3a10
MapWithAILayerInfo: Reduce initial allocations
...
For this, we just avoid saving preferences until we are are't getting
all the data sources.
For most users, this should have no effect. Only users that open JOSM,
quickly make a preference change, and exit without the preference.save
method being called will have issues.
Signed-off-by: Taylor Smock <tsmock@fb.com>
2021-07-01 08:22:27 -06:00
ed6b8bcd5d
MapWithAILayerInfo: Don't block JOSM startup
...
Signed-off-by: Taylor Smock <tsmock@fb.com>
2021-07-01 08:22:27 -06:00
64ff82db04
DetectTaskingManagerUtils: Update for TM 4
...
Signed-off-by: Taylor Smock <tsmock@fb.com>
2021-06-03 12:54:27 -06:00
455d5f5345
Prohibit copy-paste from MapWithAI layer to OSM layer
...
Signed-off-by: Taylor Smock <tsmock@fb.com>
2021-05-26 09:42:35 -06:00
b8e18653d9
Fix JOSM #20555 : ACE when removing the plugin
...
Signed-off-by: Taylor Smock <tsmock@fb.com>
2021-05-19 15:52:26 -06:00
7cf36357d2
FIXUP: Readd the check for whether or not a node pair exists as a segment
...
Signed-off-by: Taylor Smock <tsmock@fb.com>
2021-05-19 09:51:13 -06:00
1d99028c93
WaySegment -> IWaySegment
...
Signed-off-by: Taylor Smock <tsmock@fb.com>
2021-05-19 08:36:24 -06:00
5beec53fb1
DetectTaskingManagerUtils: Update deprecated method
...
Signed-off-by: Taylor Smock <tsmock@fb.com>
2021-05-18 07:24:21 -06:00
88a87bb1c1
Update for compatibility with JOSM r17903
...
Signed-off-by: Taylor Smock <tsmock@fb.com>
2021-05-18 07:24:13 -06:00
b2b22a700d
Fix JOSM-20753 -- fallout from JOSM r17752
...
Signed-off-by: Taylor Smock <tsmock@fb.com>
2021-04-13 08:01:45 -06:00
b5786301bb
Modify the max add defaults
...
Signed-off-by: Taylor Smock <tsmock@fb.com>
2021-03-16 14:17:50 -06:00
df0d947ed3
Fix JOSM-20551
...
Signed-off-by: Taylor Smock <tsmock@fb.com>
2021-03-02 07:56:54 -07:00
f68354bc9c
Fix sonar lint issue
...
Signed-off-by: Taylor Smock <tsmock@fb.com>
2021-03-02 07:56:44 -07:00
b3c0e37f80
Fix JOSM-20388, attempting to duplicate a MapWithAI layer
...
Signed-off-by: Taylor Smock <tsmock@fb.com>
2021-01-14 07:34:43 -07:00
e717fe5075
MapWithAILayer: Fix lint issue w.r.t. JLS
...
Signed-off-by: Taylor Smock <tsmock@fb.com>
2021-01-14 07:32:47 -07:00
18ac7eaec8
MapWithAIPreferences: Increase the maximum maxadd by 10 fold
...
Signed-off-by: Taylor Smock <tsmock@fb.com>
2021-01-12 12:32:50 -07:00
ab0055a4d3
FIXUP: EsriSourceReader: Fix paginiation for Esri sources
...
Signed-off-by: Taylor Smock <tsmock@fb.com>
2021-01-12 09:47:44 -07:00
9942dcd094
MapWithAILayer: Merge similar sources together (Esri only)
...
Signed-off-by: Taylor Smock <tsmock@fb.com>
2020-12-23 11:13:27 -07:00
76b5de2c6e
Sonar: Fix various issues
...
Signed-off-by: Taylor Smock <tsmock@fb.com>
2020-12-23 10:17:01 -07:00
a47032c8ec
Add code to avoid accidentally uploading bad data in older plugin versions.
...
This and related commits will be backported.
Signed-off-by: Taylor Smock <tsmock@fb.com>
2020-12-23 10:17:01 -07:00
71c494aeb6
Add initial code to check if this version of the plugin should not upload to OSM
...
Signed-off-by: Taylor Smock <tsmock@fb.com>
2020-12-22 17:20:32 -07:00
01f5f51a6f
MapWithAILayer: Don't allow MapWithAI data to be merged into a OSM data layer.
...
Signed-off-by: Taylor Smock <tsmock@fb.com>
2020-12-22 16:58:17 -07:00
8955a871a6
MapWithAILayer: Add MapWithAI to source tags when used
...
Signed-off-by: Taylor Smock <tsmock@fb.com>
2020-12-22 16:58:17 -07:00
451f0b5976
FIXUP: Fix JOSM-20203
...
Just notify the user that there is a problem. Don't cause an exception.
Signed-off-by: Taylor Smock <tsmock@fb.com>
2020-12-08 14:14:08 -07:00
a9b06f09de
Move MapWithAI Menu to the "data" menu
...
Signed-off-by: Taylor Smock <tsmock@fb.com>
2020-11-30 12:47:57 -07:00
793af99bf8
MapWithAIPreferences: Increase default max add and thus absolute max add
...
Signed-off-by: Taylor Smock <tsmock@fb.com>
2020-11-24 16:32:53 +00:00
808623d727
JUnit4 -> JUnit5
...
* Fix an NPE, doesn't fix root issue
* Add tag for command tests
* Add annotations for specific types of tests.
There is now an annotation for slow tests, tests that affect other
tests, and tests that are affected by other tests.
In the event that a wounded test (test affected by another test) is
fixed, it may have its wounded annotation removed. Under no
circumstances should the test that affects another test have its bleed
annotation removed, since it may cause other tests to fail in the
future. When a wounded annotation is added or removed, it should have a
reference to the test that is wounding it.
* Add documentation on why tests may be failing
* Add a wiremock response transformer
This ensures that any URL's in the response are also mocked (or fails
the test).
I also fixed a listener bug for MapWithAILayerInfo.
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-11-12 15:17:11 -07:00
7d64a84062
MapWithAIDataUtils: Add minimum dimensions (effectively 1 km).
...
Signed-off-by: Taylor Smock <tsmock@fb.com>
2020-11-12 09:02:39 -07:00
b77508554a
MapWithAIDataUtils: FIXUP: Don't continually try to download
...
* Only try smaller bboxes when the exception is from a
SocketTimeoutException
* If the exception is IllegalDataException, then log and show a
notification to the user that the servers may be down.
* Otherwise, throw a new JosmRuntimeException
Signed-off-by: Taylor Smock <tsmock@fb.com>
2020-11-12 08:58:42 -07:00
3500f3843f
FIXUP: Ensure that a copy of a MapWithAIInfo object actually copies everything.
...
This caused an issue where an entry would be copied without parameters,
and a failure would occur until the entry list was updated again, at
which point the parameters were set.
This adds a non-regression test that should (hopefully) ensure that this
does not occur again with that specific clone constructor.
Signed-off-by: Taylor Smock <tsmock@fb.com>
2020-10-30 08:28:40 -06:00
8e71690ed1
FIXUP: Avoid source tag conflicts
...
* Merging addresses and buildings will now merge sources _in
alphabetical_ order.
This fixes #96 .
Signed-off-by: Taylor Smock <tsmock@fb.com>
2020-10-07 08:05:21 -06:00
10e3ad76a7
FIXUP: Don't show preview data sets when expert mode is not checked
...
This fixes #99 .
This also changes the default classpath for the JRE, so that it
hopefully just works on different machines.
The minimum JOSM version is also bumped to the current stable.
Signed-off-by: Taylor Smock <tsmock@fb.com>
2020-10-07 07:27:58 -06:00
99d1b61ab9
DataConflationSender: Fix some sonar issues
...
Signed-off-by: Taylor Smock <tsmock@fb.com>
2020-09-22 11:51:42 -06:00
960798c9ca
FIXUP: Fix a potential NPE (sonar)
...
Signed-off-by: Taylor Smock <tsmock@fb.com>
2020-09-22 11:46:41 -06:00
1ffa7fcad3
Improve calculations for areas that have already been downloaded
...
Signed-off-by: Taylor Smock <tsmock@fb.com>
2020-09-21 17:08:46 -06:00
70bf24f9af
MapWithAILayer: Initialize data source listeners on initialization
...
Signed-off-by: Taylor Smock <tsmock@fb.com>
2020-09-21 17:08:46 -06:00
75b29cbec4
Revert "DownloadListener: Remove unneeded code"
...
This reverts commit a061c2110d8ad93f58c0e98870c8095c7c7308c6.
2020-09-21 17:08:46 -06:00
c5dc614d0d
DownloadListener: Remove unneeded code
...
Signed-off-by: Taylor Smock <tsmock@fb.com>
2020-09-21 17:08:46 -06:00
0ad2ed5c97
MovePrimitiveDataSetCommand: FIXUP: Account for deleted MapWithAI layer
...
Signed-off-by: Taylor Smock <tsmock@fb.com>
2020-09-18 08:38:29 -06:00
d13fa58ae8
FIXUP: Avoid an NPE when adding a custom source
...
Signed-off-by: Taylor Smock <tsmock@fb.com>
2020-09-17 15:25:55 -06:00
aa99c12233
MapWithAIProvidersPanel: FIXUP: Convert row index to model
...
* This fixes an issue where the checkbox would not properly toggle a
checkbox.
Signed-off-by: Taylor Smock <tsmock@fb.com>
2020-09-09 18:15:54 -06:00
8668fc84b2
FIXUP: Stop reading attributes into JOSM
...
Signed-off-by: Taylor Smock <tsmock@fb.com>
2020-09-03 09:38:00 -06:00
e92bfd38bb
FIXUP: Fix a possible NPE and cast 10_000 to double
...
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-08-19 11:36:16 -06:00
f66f950d16
FIXUP: PMD issues
...
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-08-19 10:28:20 -06:00
ea06356d6b
Modify MapPaintUtilsTest (disabled due to race condition)
...
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-08-19 09:59:40 -06:00
76cf948ee9
FIXUP: MapPaintUtils: Fix some sonar issues
...
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-08-18 13:06:44 -06:00
d8969f38eb
FIXUP: Don't try to use non-highway objects when adding a node to another way
...
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-08-18 11:43:37 -06:00
58be4eea0c
MapPaintUtils: Fix test, fix an NPE
...
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-08-18 09:56:58 -06:00
251f968df8
FIXUP: Add a test (and fix an issue) whereby simplified ways could cause a crash
...
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-08-17 08:14:30 -06:00
ed83ff4e1e
REFACTOR: Move commands into more appropriate packages
...
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-08-14 08:59:24 -06:00
458c5acc71
Remove unnecessary version check
...
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-08-06 11:34:46 -06:00
229bf76be8
MapPaintUtils: Enumerator -> Stream
...
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-08-05 14:18:33 -06:00
e8e3985460
Fix some errorprone issues
...
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-08-05 08:03:40 -06:00
51aa40925d
Add tests for zip file paint style and fiddle with other tests/problems
...
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-08-05 07:19:47 -06:00
5f634aac7c
FIXUP: MapPaintUtils documentation
...
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-07-29 15:49:50 -06:00
f40b349d86
Add a version check since color settings are not yet available.
...
See JOSM-19547 for more information.
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-07-29 15:21:17 -06:00
9b34329209
Create a new MapPaintUtils class.
...
This class has methods that have been moved from MapWithAIDataUtils.
It also has some new methods to modify a MapWithAI.mapcss file inplace
(special handling for zip files from JOSM website).
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-07-29 15:21:16 -06:00
9dc02dee33
Change action message when it changes what it does
...
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-07-15 08:22:59 -06:00
4ed09dd7e1
FIXUP: Spotbugs
...
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-07-14 11:39:46 -06:00
5d81c2906f
Fix some compile warnings
...
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-07-14 08:53:02 -06:00
88ab3ea863
Add a notification for when no MapWithAIInfo is available in a region.
...
This fixes #92 .
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-07-14 08:26:41 -06:00
0122707e27
Don't allow users to select data sources when there is no data layer
...
This fixes #91 .
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-07-14 08:04:29 -06:00
fd73d6a88b
Add checkbox for users to toggle.
...
Also fix an issue with the clickable licenses (opened two tabs)
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-07-13 17:07:06 -06:00
5d35fb36f3
FIXUP: Avoid crash when user may have modified conn/dupe tags
...
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-07-13 15:10:07 -06:00
93938afc77
added license url to providers table
2020-07-12 19:27:41 +03:00
2c8c3adef2
Fix JOSM-19473
...
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-07-01 10:55:46 -06:00
0bc1f03848
Improve MapWithAI menu
...
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-07-01 09:52:31 -06:00
0b43172d3f
Add preference checkbox to show preview datasets. Requires Expert Mode.
...
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-07-01 08:44:05 -06:00
d8a6bf8422
FIXUP: Remove .svg from image path
...
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-07-01 08:26:48 -06:00
af51c59346
Really fix a ReDOS attack(tm)
...
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-30 16:15:22 -06:00
c042ce8df4
Add a test for MapWithAIDefaultLayerTableModel
...
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-30 14:06:55 -06:00
6ec23bb0a9
Basic testing for AddMapWithAILayerAction + a fix for an NPE
...
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-30 13:15:07 -06:00
f4ad6b7421
Store the layers that have been downloaded into the MapWithAI
...
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-30 11:37:05 -06:00
81950d379e
Add basic test for MapWithAIProvidersPanel
...
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-30 10:51:53 -06:00
e336dedb42
Default continuous download to on
...
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-30 10:51:53 -06:00
1414061c23
Create a dynamic menu that shows sources in the current view
...
This fixes #88 .
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-30 09:45:22 -06:00
786ee5f689
Ensure that we only try to convert to tags when an equals sign is present.
...
This fixes #90 .
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-30 08:27:58 -06:00
f82a296c60
Properly cleanup the download pane for restartless plugins
...
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-29 16:28:03 -06:00
267c97200f
FIXUP: Avoid a potential deadlock on the EDT
...
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-29 16:27:45 -06:00
106313bc49
Add a preferences action to the data menu
...
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-29 16:27:26 -06:00
217e4586d6
Avoid a potential NPE
...
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-29 15:39:23 -06:00
51bc9bb1ec
Modify some wording in download window
...
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-29 08:15:09 -06:00
fb5c93744a
Add logging for conflation services
...
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-26 09:20:45 -06:00
107130a6be
FIXUP: Remove annotations that are not available in Java 8
...
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-26 09:19:15 -06:00
45d424e885
Dynamically produce source tags for Esri sources
...
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-26 09:08:31 -06:00
ab03e83100
Add a source value to the MapWithAIInfo object
...
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-26 08:33:39 -06:00
97dc67abc1
Don't show preview sources, unless expert preference has been modified
...
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-26 07:58:34 -06:00
aa4d2d58cc
FIXUP: Fix a potential regex DOS attack
...
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-25 16:32:45 -06:00
a90f7f626c
FIXUP: Currently, there should be _no_ remote control based conflation servers. Remove them from entries.
...
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-25 14:35:45 -06:00
f36f362d26
More testing for MapWithAIDownloadSourceType
...
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-25 11:01:53 -06:00
8f25ef3786
If territories are throwing an NPE, don't try to continue
...
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-24 16:46:11 -06:00
3d24632f00
Fix a test where dynamic ports caused paint styles to be added over and over again
...
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-24 16:37:48 -06:00
3565fcb232
Wiremock conflation servers
...
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-24 15:17:24 -06:00
5b4d06b96a
Ensure that MapWithAILayerInfo is always called when test rules set it up
...
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-24 15:00:33 -06:00
69d69e8df3
Add a wiremock response transformer
...
This ensures that any URL's in the response are also mocked (or fails
the test).
I also fixed a listener bug for MapWithAILayerInfo.
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-24 14:00:56 -06:00
ab34c3843e
Actually use wiremock for some tests (url's weren't always being reset)
...
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-24 14:00:56 -06:00
35768d1997
Make MapWithAILayerInfo.instance private
...
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-24 14:00:51 -06:00
1fa9bc076a
Enable third-party conflation servers
...
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-24 13:00:28 -06:00
b07707cc22
FIXUP: Ensure that we don't try to merge deleted ways
...
This fixes #81 .
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-22 13:50:19 -06:00
b3ddb241db
Modify some sequence commands to use a new function in JOSM
...
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-22 11:44:39 -06:00
a7c0a67999
FIXUP: Don't allow individual undo of address/building merges ( #79 )
...
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-22 11:44:39 -06:00
8e46ca2a65
Add test for #79 . Currently only fails when run with other tests.
...
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-22 11:44:39 -06:00
5cf2aafd1a
Fix JOSM-19420
...
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-22 08:27:38 -06:00
76d23e39ce
Track download bounding boxes from other download tabs.
...
The necessary functionality was added in JOSM r16684.
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-22 07:33:32 -06:00
a338a96f1d
Update MapWithAIInfo when preferences are null
...
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-18 16:22:22 -06:00
41061b0e98
Add some comments
...
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-18 15:13:54 -06:00
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
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
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
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
dd46b1562a
Read categories from sources.json
...
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-15 17:20:12 -06:00
462a3db5d8
Update for changes in JOSM r16641
...
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-15 07:58:45 -06:00
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
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
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
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
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
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
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
281736e0ec
Remove MapWithAIDownloadReader
...
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-10 11:06:50 -06:00
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
f29d5d53c5
OsmReaderCustom: Move to IO package
...
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-10 10:28:25 -06:00
bbfc1d8676
MapWithAIProvidersPanel: Partial refactor
...
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-10 10:28:25 -06:00
bd9fd19126
GetDataRunnable: Partial refactor
...
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-10 10:14:21 -06:00
6c8e05c5cb
DownloadMapWithAITask: public -> package visibility
...
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-10 10:14:21 -06:00
Taylor Smock