Commit Graph

14365 Commits

Author SHA1 Message Date
Milos Brzakovic (E-Search) 3f9fee0c05 Merge branch 'develop' into validation_queryparams_conflict_resolve 2021-07-06 19:07:07 +02:00
Milos Brzakovic fc6c71160c Merge pull request #8305 from openstreetmap/nsi-v5
Name-suggestion-index v6
2021-07-06 11:32:13 +02:00
Milos Brzakovic (E-Search) d2036996e3 Merge conflicts resolved 2021-07-05 10:26:44 +02:00
Bryan Housel ba016762ca Remove unnecessary context argument 2021-07-02 10:32:45 -04: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 bfb36d572d If locationSet is missing include, default to worldwide include
https://github.com/openstreetmap/iD/pull/8305#discussion_r662344647
2021-07-02 10:03:44 -04:00
Milos Brzakovic 01daef3459 Merge pull request #8372 from mapillary/mapillary-vector-tiles
Use Mapillary vector tiles and switch to v4
2021-06-30 12:21:01 +02:00
Nikola Pleša 7c8c3cd47c Update translation file 2021-06-30 11:47:37 +02:00
Nikola Pleša aa134cbb7b Add missing mapillary map feature classes 2021-06-30 11:39:55 +02:00
Nikola Pleša eba6fe056c Bring map map feature tooltips 2021-06-29 11:54:02 +02:00
Nikola Pleša 8e46b1b141 Remove unused map feature title 2021-06-28 15:26:20 +02:00
Nikola Pleša 6a35533147 Merge develop into mapillary-vector-tiles 2021-06-25 13:07:05 +02: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
Milos Brzakovic 7cb2ff7f54 Merge pull request #8442 from openstreetmap/8441-move-rotate
In move/rotate cancel, check whether graph has changed before popping
2021-06-22 11:15:56 +02:00
Milos Brzakovic (E-Search) a0c2c843ec Removing redundant @mapbox/geojson-rewind dep pkg 2021-06-21 20:42:10 +02:00
Milos Brzakovic 70b95e4fc8 Merge pull request #8341 from jleedev/fix-centroid
Fix centroid calculation in measurement panel.
2021-06-21 19:47:46 +02:00
Milos Brzakovic 83509f98de Merge pull request #8473 from mbrzakovic/8472-crossEditableZoom
CrossEditableZoom event firing fix - Use fresh zoom level value to determine if event should be fired
2021-06-21 16:54:22 +02:00
Milos Brzakovic a38aa34204 Merge pull request #8483 from openstreetmap/oci-v4
osm-community-index v4
2021-06-21 15:52:08 +02:00
Nikola Pleša 42d1e056e2 Update locale file 2021-06-15 11:05:10 +02:00
Nikola Pleša d8670ac383 Remove debugging code 2021-06-15 10:56:55 +02: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 3078f95351 bump versions 2021-06-06 10:33:23 -04:00
Bryan Housel 85e4ccf9da Bump versions 2021-06-06 10:31:20 -04:00
Bryan Housel 42f286b064 Switch to osm-community-index v4.0.0 2021-04-30 15:57:15 -04:00
Bryan Housel 28c30ba53f Bump location-conflation to v0.8.0
For community index entries that specify circular area + radius
2021-04-30 11:39:58 -04:00
Bryan Housel b47952b369 Move the complicated linkification code from iD to resolveStrings
It's easier to insert the links there, and then the HTML strings are availble for anyone who wants them
2021-04-30 11:26:24 -04:00
Bryan Housel 25bf950458 Upgrade to osm-community-index (oci) v4
The main differences here is:
- oci now supports default strings and exports a "resolveStrings" function
- this makes linkifying any urls embedded in descriptions a bit more complicated
  because urls and descriptions might need resolution, we can't use iD's normal
  t() function to do the token replacement like before
2021-04-29 17:53:53 -04:00
Milos Brzakovic (E-Search) 92a9ef2061 Move CrossEditableZoom event firing.
It should happen after projection is transformed.
2021-04-27 14:10:13 +02:00
Bryan Housel 2651e7ddc9 In move/rotate cancel, check whether graph has changed before popping
(closes #8441)
2021-04-02 09:48:41 -04:00
Bryan Housel 0d79e8ee02 Upgraded to location-conflation v0.8.0 2021-03-28 12:27:40 -04: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 9537911b68 Add guard code in locationsAt, for testing entities with invalid loc 2021-03-23 14:24:01 -04:00
Bryan Housel ec787f81ad Location-aware preset matching 2021-03-23 12:39:14 -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
Quincy Morgan 1ee45ee1f0 Add 2.19.6 changelog 2021-03-18 13:43:30 -04:00
Quincy Morgan 561709d92a Merge pull request #8398 from openstreetmap/event_fixes
Pass d3_event to click handler
2021-03-18 13:40:28 -04:00
Quincy Morgan 620a03edb3 Merge pull request #8396 from openstreetmap/dependabot/npm_and_yarn/d3-6.6.0
Bump d3 from 6.5.0 to 6.6.0
2021-03-18 13:40:00 -04:00
Quincy Morgan 0b3b1b43f1 Merge pull request #8412 from openstreetmap/dependabot/npm_and_yarn/rollup-2.41.5
Bump rollup from 2.40.0 to 2.41.5
2021-03-18 13:39:26 -04:00
dependabot[bot] 7a417b4223 Bump rollup from 2.40.0 to 2.41.5
Bumps [rollup](https://github.com/rollup/rollup) from 2.40.0 to 2.41.5.
- [Release notes](https://github.com/rollup/rollup/releases)
- [Changelog](https://github.com/rollup/rollup/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rollup/rollup/compare/v2.40.0...v2.41.5)

Signed-off-by: dependabot[bot] <support@github.com>
2021-03-18 05:27:54 +00: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 3cf5f69082 Allow missing locationSetID on presets, fields, categories
This simplifies the code a bit, just treat it as worldwide if missing
2021-03-12 12:27:50 -05:00
Bryan Housel f95e7db8c9 Create the categories like the presets
The lack of locationSet was causing them to not show up, which indirectly
broke the tutorial at the step where user needs to pick the road category.
2021-03-12 12:04:52 -05:00
Bryan Housel a0b7f9f99f Pass d3_event to click handler 2021-03-12 09:55:38 -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 2e9c463837 update imagery 2021-03-11 17:01:52 -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
dependabot[bot] e431def3c6 Bump d3 from 6.5.0 to 6.6.0
Bumps [d3](https://github.com/d3/d3) from 6.5.0 to 6.6.0.
- [Release notes](https://github.com/d3/d3/releases)
- [Changelog](https://github.com/d3/d3/blob/master/CHANGES.md)
- [Commits](https://github.com/d3/d3/compare/v6.5.0...v6.6.0)

Signed-off-by: dependabot[bot] <support@github.com>
2021-03-11 05:03:42 +00:00