mirror
/
MapWithAI
kopia lustrzana https://github.com/JOSM/MapWithAI
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność
568 Commity
2 Gałęzie
196 Tagi
15 MiB
Wykres commitów

568 Commity (8c516efeafa545ef0072dc237fcbc2b97f7de84e)

Autor SHA1 Wiadomość Data
Taylor Smock e336dedb42
Default continuous download to on 
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
 2020-06-30 10:51:53 -06:00
Taylor Smock 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
Taylor Smock 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
Taylor Smock 59f6ee8671
FIXUP: Test needed to be corrected for adding the MapWithAI preferences to the data menu 
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
 2020-06-29 16:57:51 -06:00
Taylor Smock 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
Taylor Smock 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
Taylor Smock 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
Taylor Smock 217e4586d6
Avoid a potential NPE 
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
 2020-06-29 15:39:23 -06:00
Taylor Smock 51bc9bb1ec
Modify some wording in download window 
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
 2020-06-29 08:15:09 -06:00
Taylor Smock fb5c93744a
Add logging for conflation services 
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
 2020-06-26 09:20:45 -06:00
Taylor Smock 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
Taylor Smock 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
Taylor Smock 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
Taylor Smock 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
Taylor Smock 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
Taylor Smock 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
Taylor Smock f36f362d26
More testing for MapWithAIDownloadSourceType 
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
 2020-06-25 11:01:53 -06:00
Taylor Smock 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
Taylor Smock 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
Taylor Smock 60e3d8f74a
Fix a URL so that it catches other URL patterns 
Also, make some modifications to rules so that a mocker can be used for
some classes, to reduce time running tests

Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
 2020-06-24 15:58:16 -06:00
Taylor Smock 3565fcb232
Wiremock conflation servers 
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
 2020-06-24 15:17:24 -06:00
Taylor Smock 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
Taylor Smock 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
Taylor Smock 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
Taylor Smock 35768d1997
Make MapWithAILayerInfo.instance private 
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
 2020-06-24 14:00:51 -06:00
Taylor Smock 1fa9bc076a
Enable third-party conflation servers 
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
 2020-06-24 13:00:28 -06:00
Taylor Smock 8469ea09da
FIXUP: Run code navigation on default branch, not on other branches 
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
 2020-06-23 07:14:46 -06:00
Taylor Smock f06fdfc4b3
Add code navigation 
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
 2020-06-22 16:05:59 -06:00
Taylor Smock 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
Taylor Smock 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
Taylor Smock 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
Taylor Smock 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
Taylor Smock 5cf2aafd1a
Fix JOSM-19420 
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
 2020-06-22 08:27:38 -06:00
Taylor Smock 8be1579789
Add old version for -dev version 
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
 2020-06-22 08:10:32 -06:00
Taylor Smock 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
Taylor Smock a338a96f1d
Update MapWithAIInfo when preferences are null 
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
 2020-06-18 16:22:22 -06:00
Taylor Smock 41061b0e98
Add some comments 
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
 2020-06-18 15:13:54 -06:00
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 43510ce15e
Properly clean up plugin initialization in test code 
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
 2020-06-16 08:53:45 -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 dbda18ceb6
Add -dev to the snapshot name 
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
 2020-06-16 07:28:28 -06:00
Taylor Smock b6b90b2d05
FIXUP: Actually set the original release URL 
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
 2020-06-15 17:20:12 -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