CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-02-14 01:33:03 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,365 Commits 2 Branches 0 Tags
3f9fee0c05bdcceece973ea85ff681e4dda50f21
Commit Graph

4167 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 (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
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
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
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
42f286b064 Switch to osm-community-index v4.0.0 2021-04-30 15:57:15 -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
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
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
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
9f30ebf551 Adjust verbose utilDisplayLabel call, use for more validation messages 
(re: https://github.com/osmlab/name-suggestion-index/issues/4543#issuecomment-794527259)
 2021-03-10 10:30:57 -05:00
Bryan Housel
2b7adf89fa Remember user's preference for expanding issue-info section 
This shows the tag diff, and other helpful information about the detected issues.
It is expanded by default now
(closes #6408, closes #8143)
 2021-03-08 15:10:30 -05:00
Bryan Housel
c3e9e8c8ff Support a more verbose format for listing issues 
Includes the feature type in the label
(re: https://github.com/osmlab/name-suggestion-index/issues/4543#issuecomment-791919134)
 2021-03-08 12:15:17 -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
Josh Lee
ac6251cf9e Fix centroid calculation in measurement panel. 
Copy/paste of 0a0e2dcf75
 2021-02-23 18:11:02 +00:00
Quincy Morgan
4ae7bc9bd5 Update Mapillary.Viewer call for mapillary-js v3 (re: #8245) 2021-02-23 12:27:32 -05:00
Quincy Morgan
9423f61adf Improve some variable names in core/localizer 2021-02-23 11:50:42 -05:00
Quincy Morgan
13ddeecfa7 Fix code tests for #8276 for real this time 
Add utilFetchJson to get around some quirks of d3.json and use it for coreFileFetcher
Load real general English locale strings at the beginning of code tests
 2021-02-23 11:50:00 -05:00
Quincy Morgan
d0754a9256 Trim whitespace from localized string ids 2021-02-15 11:09:26 -05:00
Quincy Morgan
6f66032237 Fix issue with replacing number tokens in strings when toLocaleString is unavailable, such as when running tests (re: #8276) 2021-02-15 10:59:44 -05:00
Quincy Morgan
e09af9a575 Merge pull request #8322 from rbuffat/fix_wms_axis_ordering_detection 
Fix wms detection to determine axis ordering
 2021-02-15 10:26:56 -05:00
Bryan Housel
76943351ca Better handling of headGraph, separate head and base queues 
This involves a few things to make the validator less weird
- _headGraph shouldn't be allowed to change while validation is happening..
- So we don't allow that to happen anymore, and keep track of _headPromise and _headIsCurrent
- If head graph falls behind, kick off another validation to catch it up
- Separate head and base work queues, so we aren't waiting for the base entities to validate
  before providing feedback to the user about what they are editing
  (the base queue can get quite large around metropolitan areas)
 2021-02-12 18:07:36 -05:00