16273 Commits

Author SHA1 Message Date
Milos Brzakovic 7e31120ec6 added scrol to mapControl 2021-09-10 15:26:37 +02:00
John Firebaugh 9a26ae3e9e Merge pull request #8675 from openstreetmap/jfirebaugh/join-conflicting-relations
Disable merge operation when it would damage relations
2021-09-09 19:38:02 -07:00
John Firebaugh 1457759994 Add support for connectivity relations 2021-09-08 20:30:38 -07:00
John Firebaugh a14cf49710 Disable merge operation when it would damage relations
The operation is disabled when attempting to join ways which don't belong to identical sets of relations. Restriction relations are excluded, because they are already handled with slightly different logic.

Fixes #8674
Fixes #8645
Fixes #3825
Fixes #1512
2021-09-04 15:42:07 -07:00
Milos Brzakovic 73e5cf0142 Merge pull request #8650 from k-yle/website-tag
add link button next to website tag
2021-09-01 13:12:45 +02:00
Kyle Hensel 7525f9545b commit changes to dist/.../en.min.json 2021-09-01 09:55:14 +12:00
Bryan Housel 78961072a7 We do need to actually validate the head entities, can't skip them
re: the fix for #8632 - we can't actually skip validation on these.
The better solution is to move the check to getIssues() so the user isn't
credited for causing the issues unless it's something they actually touched
2021-08-27 17:43:49 -04:00
Bryan Housel 113f079449 Uncache the entity before starting the work
This fixes a situation where several entities in the queue are involved in a
disconnected crossing, and the first one detects the disconnection, but a
later one clears out that first detection from the cache.  Now we clear
caches one time before starting the validation work.
2021-08-27 17:24:45 -04:00
Bryan Housel b94151396d Expand set of entities to validate to include _related_ to issues
This will catch the situation where an edit or undo affects something related without
actually touching the item - for example an undo can cause a connected way to disconnect
from the main graph.
2021-08-27 17:20:32 -04:00
Bryan Housel 1b5bd4d9c3 Actions performed (e.g. adding midpoint) must trigger validation
(re: #8655)
2021-08-27 17:14:06 -04:00
Bryan Housel 9e3df2c4aa Create an issue key property that changes when data needs refresh
(closes #8655)
2021-08-27 17:13:36 -04:00
Kyle Hensel 416c1af372 add link button next to website tag 2021-08-19 15:17:45 +12:00
Bryan Housel 08c765236f Force tests to use mouse events instead of pointer events
The pointer events use a different mechanism for counting clicks that doesn't
work when the tests are run in a real browser like Chrome. This change forces
iD to always use mouse events during testing, even in a real browser.
2021-08-18 18:58:30 -04:00
Bryan Housel b2d18d1ebe Fix hash tests in Chrome, avoid loading imagery tiles 2021-08-18 12:51:13 -04:00
Milos Brzakovic (E-Search) 81b7e282c3 Set development version number 2021-08-17 17:14:48 +02:00
Milos Brzakovic (E-Search) fc5d790b0e v2.20.1 2021-08-17 16:52:28 +02:00
Milos Brzakovic (E-Search) a974a62cb5 npm run translations 2021-08-17 12:57:23 +02:00
Milos Brzakovic (E-Search) 63dfd90335 npm run imagery 2021-08-17 11:05:03 +02:00
Bryan Housel 003628d6b0 Try not to load imagery when running tests
By default, the `rendererBackground` code will choose an initial imagery based on what
sources are available at the given map location. It looks like this code will fallback
to "custom" _before_ "none", and I noticed that in some cases it was trying to fetch
whatever source happened to be stored in the "custom" template in localStorage.

This commit adds an explicit window.location.hash in a few places to encourage the
background layer to be "none". Some tests do change the hash, so this isn't perfect.
2021-08-16 22:51:39 -04:00
Bryan Housel 33fab5580b Before calling init() make sure the assetPath is set
init kicks off building the ui, which can fetch spritesheets for the <defs>
The assetPath needs to be set otherwise these files will not be found
2021-08-16 22:06:42 -04:00
Milos Brzakovic 8eb2de93be Merge pull request #8637 from openstreetmap/validation_8632_etc
More validator fixes
2021-08-16 23:44:43 +02:00
Bryan Housel 4f1d5f0851 Similar to e7ad3845f, avoid using finally(done) as it swallows errors 2021-08-16 15:34:26 -04:00
Bryan Housel e7ad3845f9 Fix file fetcher tests that touch the intro_graph
- Before it wasn't actually loading the intro graph because assetPath not set
- The test for Three Rivers City Hall was using the wrong nodeid
- All these test errors were being ignored because of the use of .finally(done)
- To actually make an error happen, we can call `done(err)` with the Error
2021-08-16 15:23:31 -04:00
Bryan Housel 1282d3b059 Don't use a util function for a thing that exists 1x in the code 2021-08-16 14:23:24 -04:00
Bryan Housel 746417e1f4 Fix coreLocations tests access of locationSetID property 2021-08-16 14:11:36 -04:00
Bryan Housel 5aee120a86 Prefill the locale_tagging_en with fake string data
This avoids the numerous "missing translation" errors filling up the console
2021-08-16 14:02:25 -04:00
Bryan Housel bb84962e5d Only insert sources into the fileMap if not already there
This allows us to setup the fileMap correctly for testing so
that it never tries to fetch assets from the CDN.
2021-08-16 13:28:55 -04:00
Milos Brzakovic 99cad0b7a4 Merge pull request #8638 from openstreetmap/redraw_while_transformed
Can't redraw while transformed
2021-08-16 16:59:54 +02:00
Bryan Housel a962c6f96c Can't redraw while transformed 2021-08-13 17:36:45 -04:00
Bryan Housel 1f172d5623 Make the crossing_ways hash less strict
Previously it was including a lot of data about the edge, and a very specific
crossing location.  This meant that any tiny perturbation in the crossing ways
would generate a new issue hash, effectively "fixing" the old crossing issue and
creating a new one.
2021-08-13 16:24:29 -04:00
Bryan Housel 34c3ea472d Credit user with a fix if they touched any involved entity
This can occur if there are several ways disconnected from the graph and
the user fixes these, but then partially undoes their fixes.

The current diff might not contain the entity that fixed the issue
(reconnected the disconnected graph), but they did fix the issue elsewhere.
2021-08-13 15:56:08 -04:00
Bryan Housel 93b868d95f Fix how resolved issues are counted across undo, simplify code
(re: #8632)
2021-08-13 14:47:38 -04:00
Bryan Housel b5d7cdb6fa Use utilHashcode to generate reasonable ids for crossing_ways issues
The ones before were a giant blob of json
2021-08-13 12:56:50 -04:00
Bryan Housel f58ddb21fb Remove old entityIDsToValidate() code 2021-08-13 12:32:13 -04:00
Bryan Housel bb0b5786d9 Use context.graph()/context.hasEntity() here, not cache.graph,
because that is the graph that the calling code will be using.
2021-08-13 12:02:38 -04:00
Bryan Housel 2434e5edaa In the head cache, only validate features that the user is responsible for
(closes #8632)

For example, a user can undo some work and an issue will still present in the
head graph, but we don't want to credit the user for causing that issue.
2021-08-13 11:25:36 -04:00
Milos Brzakovic 1fb42bc852 Merge pull request #8636 from openstreetmap/togeojson_package_switch
Switch to more maintained @tmcw/togeojson
2021-08-13 17:13:45 +02:00
Bryan Housel 3e8d33a668 Use coreDifference.complete() instead of entityIDsToValidate()
From what I can tell, this code is nearly the same as what the "complete"
difference already gives us - combined nodes from both previous and current,
multipolygon members, parents of nodes/relations
2021-08-13 10:53:57 -04:00
Milos Brzakovic 2270b5dd9c fixes mac os firefox scroll. closes #8595 2021-08-13 16:51:02 +02:00
Bryan Housel 96c5dd1c7c Store graph with validation cache, give them names, es6 some things 2021-08-12 11:37:57 -04:00
Milos Brzakovic 05d0d04222 Merge pull request #8635 from openstreetmap/noteTest-BuildFailures
AddNote test fix
2021-08-12 15:05:11 +02:00
Milos Brzakovic 25e2050bcb switched to more maintained @tmcw/togeojson
Solves few security issues
2021-08-12 13:38:56 +02:00
Milos Brzakovic 21b0fc4f36 semi 2021-08-11 19:57:40 +02:00
Milos Brzakovic ee072772c2 addNote test fix 2021-08-11 19:27:37 +02:00
Milos Brzakovic 5ff84a8efd bump svg-sprite to 1.5.1 2021-08-11 18:38:53 +02:00
Milos Brzakovic a2a3a53cf4 Merge pull request #8523 from artembert/declare-missed-dependencies-in-package-json
Declare missed but used dependencies in package.json
2021-08-11 18:30:37 +02:00
Milos Brzakovic b0e3c3c56b Merge pull request #8627 from openstreetmap/nsi_route_master
Treat route_master relations like route relations for matching to NSI
2021-08-09 19:27:38 +02:00
Milos Brzakovic d0577b0364 Merge pull request #8626 from openstreetmap/validator
Validator improvements
2021-08-09 18:07:01 +02:00
Bryan Housel 0db99fe530 When adding not:* tag, remove the old wikipedia and wikidata tags 2021-08-07 00:42:07 -04:00
Bryan Housel 97ddf125d2 Adjust wording of "Tag as not the same thing" 2021-08-06 17:14:32 -04:00