Commit Graph

565 Commits

Author SHA1 Message Date
Martin Raifer
d7cdab7f19 bump 'marked' to v4
closes #8952

see https://github.com/markedjs/marked/releases/tag/v4.0.0
2022-02-04 17:22:22 +01:00
Martin Raifer
6c2f9a8f7d fix rendering of html of improveOSM issues 2022-02-02 18:55:33 +01:00
Martin Raifer
f990d5ac87 fix rendering of html of keepright issues 2022-02-02 18:55:33 +01:00
Martin Raifer
fe4f5c9548 add "cai_scale" to tags with upper case values
fixes #8706
2021-12-14 15:53:34 +01:00
Martin Raifer
344a903170 Merge branch 'nsi_primary_match' into develop 2021-11-30 13:16:58 +01:00
Bryan Housel
3b3f80f690 Improve the checking of results from the NSI matcher..
(fixes: https://github.com/osmlab/name-suggestion-index/issues/5693)

Previously the code would accept the first useful match, however this match
might be an "alternate" match.  Now we keep iterating until we find a "primary"
match.

This bug could cause the validator to suggest upgrading well-tagged features to
a less wanted feature type.  For example a "Tesla Supercharger" would flip to
a "Tesla Destination Charger" if it had "Tesla" anywhere in its list of tags
(because `short_name=Tesla` is an "alternate" match for both destination
chargers and super chargers)
2021-11-29 16:49:36 -05:00
Martin Raifer
9f3f8e1366 rename method 2021-11-29 19:26:18 +01:00
Martin Raifer
d78c357588 replace raw html injection of localized texts
by using d3 to insert the localized text spans directly into the DOM
2021-11-26 18:51:45 +01:00
Martin Raifer
040257fd44 replace unnecessary setting of raw "html" with "text" 2021-11-18 18:53:33 +01:00
Minh Nguyễn
3956b4415f Escape user name in profile URL 2021-11-17 18:18:08 -08:00
Martin Raifer
25d4ff100f rename all openstreetcam references to kartaview
closes #8807
2021-11-16 17:42:53 +01:00
Milos Brzakovic
021107cb81 Merge pull request #8642 from openstreetmap/testing_data
Test improvements
2021-09-28 11:08:31 +02:00
Milos Brzakovic
a00a9162e7 Merge branch 'develop' into tag_as_not 2021-09-27 19:03:46 +02: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
Bryan Housel
52e8555a8f Add a validator fix option to tag as not: a matched item
(re: #6577)
2021-08-06 12:26:19 -04:00
Bryan Housel
0f913113c7 Match a 'route_master' as if it were a 'route'
This code just treats `type=route_master` relations as if they were `type=route`
so they will match the transit networks in NSI.

(closes https://github.com/osmlab/name-suggestion-index/issues/5184)
2021-08-05 22:05:11 -04:00
Bryan Housel
15ee63e875 Improve code for keeping only interesting key/value pairs
Before it was not actually checking that the osmvalue was in the vmap,
so we were testing a bunch of pairs like `highway/crossing` and
`highway/residential` that would never match a NSI category.
2021-08-05 16:59:07 -04:00
Bryan Housel
1d5c8253be NSI matcher shouldn't treat old_name like a name tag
(closes #8617)
2021-08-02 12:21:34 -04:00
Bryan Housel
bd97df6aac In general, preserve existing values for tags that can be toplevel
We'll only _replace_ the tag value if this tag is the toplevel/defining tag for the matched item (`k`)
(closes #8615)
2021-08-02 12:07:13 -04:00
Milos Brzakovic (E-Search)
d2036996e3 Merge conflicts resolved 2021-07-05 10:26:44 +02:00
Bryan Housel
8db1c1f7f5 Construct URL to match version number that package.json has
https://github.com/openstreetmap/iD/pull/8305#discussion_r663037548
2021-07-02 10:27:50 -04:00
Bryan Housel
896d14ba80 Upgrade to name-suggestion-index v6
Also bump country-coder and location-conflation
2021-06-24 16:41:50 -04:00
Nikola Pleša
87a823f093 Fix traffic sign rendering and geometry conversion 2021-06-15 10:56:08 +02:00
Nikola Pleša
7a0d8adb7b Switch to Mapillary API v4 2021-06-15 10:13:07 +02:00
Bryan Housel
add11432d3 More sophisticated name/branch splitting
(re: https://github.com/openstreetmap/iD/pull/8305#issuecomment-805454952)
2021-03-24 18:03:37 -04:00
Bryan Housel
55d9da9480 Improve logic for matching name fragments like TUI ReiseCenter
(re: https://github.com/osmlab/name-suggestion-index/issues/4543#issuecomment-799732746)
2021-03-22 20:23:22 -04:00
Bryan Housel
77e7620ab8 Switch to published NSI v5 🎉 2021-03-22 14:39:58 -04:00
Bryan Housel
f5b6024988 Revise name/branch splitting code
This now breaks the name into fragments and reruns the fragments against the NSi matcher
rather than using flaky regular expressions. Has a few advantages:
(re: https://github.com/osmlab/name-suggestion-index/issues/4543#issuecomment-797577999)
2021-03-12 15:03:50 -05:00
Bryan Housel
d282140999 If we match a generic name, stop looking
This is for "nextbike"
(re: https://github.com/osmlab/name-suggestion-index/issues/4543#issuecomment-796126041)
2021-03-11 17:51:09 -05:00
Bryan Housel
98a622f41a Make sure a name is either primary or alternate (can't be both) 2021-03-11 17:46:09 -05:00
Bryan Housel
19a8fd16d2 Be smarter about identifying what tree an osm feature might be in
Needed this after I added `highway=bus_stop` to the transit tree
2021-03-11 16:28:26 -05:00
Bryan Housel
a827e13a6d Be less aggressive about removing toplevel tags
(re: https://github.com/openstreetmap/iD/pull/8305#issuecomment-792871448)
2021-03-08 11:36:41 -05:00
Bryan Housel
7a82dba825 Only match alternate amenity/yes if it actually is tagged that way 2021-03-05 10:59:15 -05:00
Bryan Housel
3f8faec413 Improvements to name gathering
- Actually bail out properly if namelike values contain semicolon ';'
- Prioritize the canonical tags like `brand:wikidata`, `operator:wikidata`
- Don't insert a name into 'alternate' set if it's already in 'primary' set
2021-03-05 10:40:06 -05:00
Bryan Housel
1b1bf8eed2 Don't offer upgrades to dissolved items 2021-03-05 10:04:29 -05:00
Bryan Housel
bbed217625 For some names, consider splitting name into name and branch.. 2021-03-05 09:54:47 -05:00
Bryan Housel
1f6a2121c4 Move all of NSI into a service, rewrite matcher code 2021-03-03 12:04:37 -05:00
Nikola Pleša
6cd17713fa Use Mapillary vector tiles for images, sequences and map features 2021-03-01 10:19:41 +01:00
Quincy Morgan
4ae7bc9bd5 Update Mapillary.Viewer call for mapillary-js v3 (re: #8245) 2021-02-23 12:27:32 -05:00
Quincy Morgan
3fade479af Merge pull request #8310 from openstreetmap/fix_notes
Fix a few errors in note processing
2021-02-05 11:46:06 -05:00
Bryan Housel
f195128968 Fix a few errors in note processing
- Notes still load over the xml api, so when the user is not authenticated,
  we can't use d3_json to fetch them (instead use to d3_xml)
- Make sure to delete the deferred callback handles once the callbacks are
  processed (probably unnecessary, but good housekeeping)
- Remove a stray `if (!json.elements)` block from the `parseUserJSON`
  function. This was preventing the user profile from parsing, as the
  user's JSON has no such property (was probably copied from `parseJSON`)
2021-01-21 14:29:17 -05:00
Bryan Housel
2cd11040b3 Swap out w8r/martinez clipper for mfogel/polygon-clipping
This is a drop in replacement that performs better and yields more correct results
see also https://github.com/ideditor/location-conflation/pull/20
2021-01-21 11:31:29 -05:00
Quincy Morgan
2dd0b8449f Rewrite some confusing nested ternaries (close #8117) 2020-12-03 12:18:39 -05:00
Quincy Morgan
f8ddfa9224 Use JSON for user and users endpoints (close #8188) 2020-11-10 12:46:43 -05:00
Quincy Morgan
481b80e5cb Fetch the parent relations when downloading a single entity, e.g. when launching iD with a feature selected (close #6731) 2020-11-10 10:00:44 -05:00
Quincy Morgan
981cdc6736 Apply photo date and username filters to Mapillary sign and object detections (close #8133)
Don't update disabled SVG layers upon photo changes
2020-10-29 11:59:12 -04:00
Quincy Morgan
792a4e8594 Fix background tile issues caused by the cache not properly updating upon load/error with D3 v6 2020-10-26 14:52:58 -04:00
Quincy Morgan
f2ef27f78c Enable no-implicit-coercion eslint rule for strings 2020-10-23 14:03:50 -04:00
Quincy Morgan
dc8fd13586 Enable array-callback-return eslint rule 2020-10-23 13:47:09 -04:00
Quincy Morgan
4059ee5118 Enable block-scoped-var eslint rule 2020-10-23 13:38:36 -04:00