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
8,265 Commits 2 Branches 0 Tags
07262fa7118c8cf4e111ebe173bafbeafaf9928a
Commit Graph

8265 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bryan Housel
07262fa711 Add tests for #4589 2018-01-09 23:57:44 -05:00
Bryan Housel
748abdb950 Code formatting 2018-01-09 17:46:15 -05:00
Bryan Housel
239bc8ffb9 Merge pull request #4670 from openstreetmap/greenkeeper/marked-0.3.12 
Update marked to the latest version 🚀
 2018-01-09 11:08:26 -05:00
Bryan Housel
528739b9b0 Drop unit from default address format 2018-01-09 10:15:18 -05:00
Bryan Housel
f0a27bc1ec Simplify way segmentation and fix bug with adjacent segment type 
(closes #4669)

Now instead of creating MultiLineString targets, we just create a bunch of
LineString targets.  This makes the code simpler, and anyway the entity is
still there in `properties` for drawing code to decide what to do with the target.

Incidentally, this change allows iD to support an extrusion operation.
(Because each way segment has its own unique GeoJSON target now)
 2018-01-09 10:12:29 -05:00
Bryan Housel
4c61fadb18 Merge pull request #4671 from Andygol/patch-2 
Remove addr:unit for addresses in Ukraine
 2018-01-09 07:34:04 -05:00
Andrey Golovin
f339c57838 Remove addr:unit for addresses in Ukraine 2018-01-09 13:26:54 +02:00
greenkeeper[bot]
fcb2a0aa85 fix(package): update marked to version 0.3.12 2018-01-09 00:20:41 +00:00
Bryan Housel
e661281e38 Prevent self intersecting lines without a junction node 
(closes #4646)
 2018-01-08 19:17:50 -05:00
Bryan Housel
49eb46fefb Add epsilon parameter to geoVecEqual 2018-01-08 17:04:56 -05:00
Bryan Housel
ea9643e08b Allow Alt/option key to disable geometry check and nope cursor 
(re: #4646)
 2018-01-08 15:47:29 -05:00
Bryan Housel
58eaca2aa0 Ignore area closing segment during move when validating geometry 
(closes #4655)
 2018-01-08 12:09:17 -05:00
Bryan Housel
66e8ce1363 Merge pull request #4667 from althio/patch-1 
Restore address format for ["fr", "lu", "mo"]
 2018-01-08 10:42:01 -05:00
Bryan Housel
45ffa3b731 Merge pull request #4658 from openstreetmap/fix_duplicate_saves 
Fix duplicate upload bug, improve upload performance
 2018-01-08 10:31:15 -05:00
Bryan Housel
8472f99347 Zooming out should not exit save mode 
(closes #4664)
 2018-01-08 09:49:32 -05:00
Benoît
6ec6c31948 Restore fr lu mo addressing 
addr:unit is not standard in addressing for France
in France : 800 addr:unit / 4 000 000 addr:housenumber = 0,0002 (0,02%)

This partly reverts de6b4fb6a2 in https://github.com/openstreetmap/iD/pull/4235
 2018-01-08 15:16:11 +01:00
Bryan Housel
1b973f3c9b Be more careful about enter/update selection in conflict resolution ui 
This fixes one of the issues in #4351 where the radio button was not
selected. This was likely introduced during the upgrade to d3 v4, now
that enter selections do not automatically flow into update anymore.
(the fix is to add a `merge` to ensure that the `selection.each` actually
has some things to iterate over)
 2018-01-07 23:46:54 -05:00
Bryan Housel
590487d237 Fix escape keybind when conflicts ui is active 
(re: 4351)
 2018-01-06 23:16:48 -05:00
Bryan Housel
a22cfe64b8 Avoid loading circular relations by storing ids in _loaded object 
(re: #3056)
 2018-01-06 00:30:26 -05:00
Bryan Housel
ac86869b4a Add conflict checking progress, guard code for user authentication 2018-01-05 18:11:49 -05:00
Bryan Housel
a63c4a72fe Improvements to save flow 
- Attempt fast save first, only perform conflict resolution if necessary (re: #3056)
- Block reentry of save, and dont keep focus on save button (closes #4641)
- Refactor modeSave() for code clarity (avoid shared state in closure variables)
 2018-01-05 15:11:44 -05:00
Bryan Housel
437893ebb8 Don't reenter putChangeset, allow reuse of open changeset id 
We are going to start trying an opportunistic save, then only
start the conflict resolution stuff if the server returns a 409.
Reusing an already open changeset makes sense in this situation.
 2018-01-04 23:27:00 -05:00
Bryan Housel
8914d1ce36 Variable cleanups and formatting 2018-01-04 16:13:13 -05:00
Bryan Housel
954227be53 Don't let modal button cover up header bottom border 2018-01-04 16:12:40 -05:00
Bryan Housel
286c09366a Remove unused var (eslint) 2018-01-04 15:55:53 -05:00
Bryan Housel
b2eb982044 Add support for oneway alternating/reversible to oneway check fields 
Also allow checkbox field to display non-standard values
(i.e. not 'yes' or 'no) in the field label
 2018-01-04 13:41:35 -05:00
Bryan Housel
c908807f64 Render oneway=alternating, oneway=reversible with dual arrows 
(closes #4291)
 2018-01-04 13:40:49 -05:00
Bryan Housel
77ec49d959 Add some more building presets 
(closes #4505)
 2018-01-04 10:53:09 -05:00
Bryan Housel
1111c6b0c1 Fallback to event.keyCode if event.key is outside ISO-Latin-1 
(closes #4618)
 2018-01-03 23:37:35 -05:00
Bryan Housel
99a21d1117 Render points as vertices at zoom >= 18 (was > 18) 
(closes #4642)
 2018-01-03 16:52:29 -05:00
Bryan Housel
dba4626cfa Merge pull request #4575 from openstreetmap/background_pane 
Enhancements to Background, Map Data, Help panes
 2018-01-03 15:32:18 -05:00
Bryan Housel
9155641e5e Remove background opacity pngs so #4575 will merge cleanly 2018-01-03 15:28:08 -05:00
Bryan Housel
04fa29cfe6 Move link to imagery faq, reword as "Imagery Info / Report a Problem" 
(closes #4546)
 2018-01-03 15:23:47 -05:00
Bryan Housel
46ebe02555 Clean up styles, move minimap toggle below background imagery list 2018-01-03 14:35:27 -05:00
Bryan Housel
53aa2973e4 Refactor display options controls to uiBackgroundDisplayOptions 2018-01-03 01:47:25 -05:00
Bryan Housel
48834a0ea5 Add reset buttons for display sliders 2018-01-02 23:41:21 -05:00
Bryan Housel
baeff8f59c Don't autocomplete a longer value if search matches a value exactly 
(closes #4549)
 2018-01-02 17:55:25 -05:00
Bryan Housel
11d0ec87cf Merge pull request #4624 from nnodot/empty-changeset-comment-style 
Highlight the changeset editor when the comment is empty
 2018-01-02 16:46:55 -05:00
Bryan Housel
31770b3957 Add Car Pooling preset 
(closes #4623)
 2018-01-02 16:30:32 -05:00
greenkeeper[bot]
d2ffde8b48 chore(package): update rollup to version 0.53.3 2018-01-02 15:47:30 -05:00
Bryan Housel
18bec2be18 Set Payment Type as universal field, add it to many presets 
(closes #4437)
 2018-01-02 15:42:23 -05:00
Bryan Housel
8928e95da2 Allow fallback presets (area, line, point) to appear in the recent list 
(closes #4612)
 2018-01-02 15:07:35 -05:00
Bryan Housel
1658ada4db Switch from "commercial" to "suitcase" icon for most offices 
Probably should have just done this when we did #4590
The "commercial" icon looks more like a retail storefront.
 2018-01-02 14:25:40 -05:00
Bryan Housel
536c71dc6b Remove duplicate Notary Office preset 
(closes #4634)
 2018-01-02 14:25:12 -05:00
Bryan Housel
9f1b71bb7e Add support for junction=circular (same as junction=roundabout) 
(closes #4637)
 2018-01-02 13:27:11 -05:00
Bryan Housel
a20d26fc9b Add search terms "kennel" "cattery" "pet" to Animal Boarding preset 
(closes #4647)
 2018-01-02 12:56:19 -05:00
Bryan Housel
05d8620efe Merge branch 'willemarcel-node-number' 2018-01-02 11:49:10 -05:00
Bryan Housel
74b6c1208f Add light bulb icon for highway=street_lamp preset 
(closes #4609)
 2018-01-02 11:48:24 -05:00
Bryan Housel
47b9c9976b Merge pull request #4644 from willemarcel/node-number 
add number of nodes information to measurement panel
 2018-01-02 09:02:38 -05:00
Bryan Housel
240c80dcd5 Merge branch 'node-number' of https://github.com/willemarcel/iD into willemarcel-node-number 2018-01-02 09:00:16 -05:00