CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-04-30 07:27:54 +02:00
Code Issues Packages Projects Releases Wiki Activity
14,285 Commits 2 Branches 0 Tags
85e4ccf9da80bddc77816d79817feb9de89dc984
Commit Graph

14285 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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 a0b7f9f99f Pass d3_event to click handler 2021-03-12 09:55:38 -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
Quincy Morgan 72d56e54e8 Merge pull request #8375 from openstreetmap/dependabot/npm_and_yarn/uglify-js-3.13.0 
Bump uglify-js from 3.12.8 to 3.13.0
 2021-03-03 14:32:04 -05:00
dependabot[bot] 849cc825b2 Bump uglify-js from 3.12.8 to 3.13.0 
Bumps [uglify-js](https://github.com/mishoo/UglifyJS) from 3.12.8 to 3.13.0.
- [Release notes](https://github.com/mishoo/UglifyJS/releases)
- [Commits](https://github.com/mishoo/UglifyJS/compare/v3.12.8...v3.13.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-03-02 05:21:50 +00:00
Quincy Morgan 8a9b4d5321 Merge pull request #8371 from openstreetmap/dependabot/npm_and_yarn/rollup-2.40.0 
Bump rollup from 2.39.1 to 2.40.0
 2021-03-01 10:18:27 -05:00
dependabot[bot] 8dd3fe230f Bump rollup from 2.39.1 to 2.40.0 
Bumps [rollup](https://github.com/rollup/rollup) from 2.39.1 to 2.40.0.
- [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.39.1...v2.40.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-03-01 05:07:55 +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 8ec754ab54 Merge pull request #8329 from openstreetmap/dependabot/npm_and_yarn/mapillary-js-3.1.0 
Bump mapillary-js from 3.0.0 to 3.1.0
 2021-02-23 12:14:47 -05:00
dependabot[bot] f2da1de2af Bump mapillary-js from 3.0.0 to 3.1.0 
Bumps [mapillary-js](https://github.com/mapillary/mapillary-js) from 3.0.0 to 3.1.0.
- [Release notes](https://github.com/mapillary/mapillary-js/releases)
- [Changelog](https://github.com/mapillary/mapillary-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/mapillary/mapillary-js/compare/v3.0.0...v3.1.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-02-23 17:10:10 +00:00
Quincy Morgan 5fa69938cd Merge pull request #8361 from openstreetmap/dependabot/npm_and_yarn/json-stringify-pretty-compact-3.0.0 
Bump json-stringify-pretty-compact from 2.0.0 to 3.0.0
 2021-02-23 12:08:44 -05:00
Quincy Morgan 5f276a4bc5 Merge pull request #8346 from openstreetmap/dependabot/npm_and_yarn/marked-2.0.0 
Bump marked from 1.2.9 to 2.0.0
 2021-02-23 12:08:09 -05:00
dependabot[bot] 3b481874dd Bump json-stringify-pretty-compact from 2.0.0 to 3.0.0 
Bumps [json-stringify-pretty-compact](https://github.com/lydell/json-stringify-pretty-compact) from 2.0.0 to 3.0.0.
- [Release notes](https://github.com/lydell/json-stringify-pretty-compact/releases)
- [Changelog](https://github.com/lydell/json-stringify-pretty-compact/blob/main/CHANGELOG.md)
- [Commits](https://github.com/lydell/json-stringify-pretty-compact/compare/v2.0.0...v3.0.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-02-23 17:03:26 +00:00
dependabot[bot] 8534d16015 Bump marked from 1.2.9 to 2.0.0 
Bumps [marked](https://github.com/markedjs/marked) from 1.2.9 to 2.0.0.
- [Release notes](https://github.com/markedjs/marked/releases)
- [Changelog](https://github.com/markedjs/marked/blob/master/release.config.js)
- [Commits](https://github.com/markedjs/marked/compare/v1.2.9...v2.0.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-02-23 17:02:38 +00:00
Quincy Morgan c1a63065ee Merge pull request #8355 from openstreetmap/dependabot/npm_and_yarn/rollup/plugin-node-resolve-11.2.0 
Bump @rollup/plugin-node-resolve from 11.1.1 to 11.2.0
 2021-02-23 12:02:31 -05:00
Quincy Morgan 056a8ca525 Update en.min.json 2021-02-23 11:50:53 -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
dependabot[bot] 34e7be2796 Bump @rollup/plugin-node-resolve from 11.1.1 to 11.2.0 
Bumps [@rollup/plugin-node-resolve](https://github.com/rollup/plugins) from 11.1.1 to 11.2.0.
- [Release notes](https://github.com/rollup/plugins/releases)
- [Commits](https://github.com/rollup/plugins/compare/node-resolve-v11.1.1...node-resolve-v11.2.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-02-19 05:10:07 +00:00
Quincy Morgan 997b453b98 Fix code tests for #8276 2021-02-15 12:56:46 -05:00
Quincy Morgan 61d04104c1 Prefer latest phantomjs 2021-02-15 11:58:08 -05:00
Quincy Morgan 9b667f5d9e Fix running of tests in browser 2021-02-15 11:55:28 -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
Quincy Morgan ef18d6ea34 Merge pull request #8354 from openstreetmap/dependabot/npm_and_yarn/rollup-2.39.0 
Bump rollup from 2.38.5 to 2.39.0
 2021-02-15 10:25:09 -05:00
dependabot[bot] 5a12a5259d Bump rollup from 2.38.5 to 2.39.0 
Bumps [rollup](https://github.com/rollup/rollup) from 2.38.5 to 2.39.0.
- [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.38.5...v2.39.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-02-15 05:42:51 +00:00
Quincy Morgan 9ed36281ba Merge pull request #8348 from openstreetmap/dependabot/npm_and_yarn/osm-community-index-3.1.1 
Bump osm-community-index from 3.1.0 to 3.1.1
 2021-02-10 10:57:16 -05:00
dependabot[bot] a95d1c3e1b Bump osm-community-index from 3.1.0 to 3.1.1 
Bumps [osm-community-index](https://github.com/osmlab/osm-community-index) from 3.1.0 to 3.1.1.
- [Release notes](https://github.com/osmlab/osm-community-index/releases)
- [Changelog](https://github.com/osmlab/osm-community-index/blob/main/CHANGELOG.md)
- [Commits](https://github.com/osmlab/osm-community-index/compare/v3.1.0...v3.1.1)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-02-10 05:28:46 +00:00
Quincy Morgan ca8a61cd36 Merge pull request #8318 from openstreetmap/dependabot/npm_and_yarn/d3-6.5.0 
Bump d3 from 6.3.1 to 6.5.0
 2021-02-05 11:46:43 -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
Quincy Morgan 8245822e60 Merge pull request #8337 from openstreetmap/dependabot/npm_and_yarn/rollup-2.38.3 
Bump rollup from 2.36.2 to 2.38.3
 2021-02-01 10:05:43 -05:00
dependabot[bot] 4bfa7dd157 Bump rollup from 2.36.2 to 2.38.3 
Bumps [rollup](https://github.com/rollup/rollup) from 2.36.2 to 2.38.3.
- [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.36.2...v2.38.3)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-02-01 15:03:22 +00:00
Quincy Morgan a55d99a2db Merge pull request #8335 from openstreetmap/dependabot/npm_and_yarn/rollup/plugin-node-resolve-11.1.1 
Bump @rollup/plugin-node-resolve from 11.0.1 to 11.1.1
 2021-02-01 09:55:19 -05:00
dependabot[bot] a282ce3194 Bump @rollup/plugin-node-resolve from 11.0.1 to 11.1.1 
Bumps [@rollup/plugin-node-resolve](https://github.com/rollup/plugins) from 11.0.1 to 11.1.1.
- [Release notes](https://github.com/rollup/plugins/releases)
- [Commits](https://github.com/rollup/plugins/compare/commonjs-v11.0.1...node-resolve-v11.1.1)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-02-01 05:24:07 +00:00
Marc-marc-marc 6fa4bdf88a Fix contributing document typo (#8331) 
fix typo data/core/yaml -> data/core.yaml
 2021-01-28 13:01:06 +00:00
Bryan Housel 4c1d51348d Don't repurpose a node with interesting tags in crossing_ways fix 
(closes #8326)
 2021-01-27 14:38:11 -05:00
René Buffat c721c1ebb5 fix wms detection 2021-01-26 20:30:36 +01:00
dependabot[bot] cb1e087126 Bump d3 from 6.3.1 to 6.5.0 
Bumps [d3](https://github.com/d3/d3) from 6.3.1 to 6.5.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.3.1...v6.5.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-01-25 05:22:33 +00: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
Quincy Morgan 2803cd721e Merge pull request #8309 from openstreetmap/polygon-clipping 
Swap out w8r/martinez clipper for mfogel/polygon-clipping
 2021-01-21 14:17:15 -05:00