0730e0432b
keep localGraph - UI can now flip between mine/theirs
2015-02-20 17:01:19 -05:00
861bd14903
map#trimmedExtentZoom
...
Like map#extentZoom, but uses trimmed viewport instead of full viewport
to avoid putting the extent under UI buttons and border elements.
This is because in conflict resolution the user will be extentZooming to see
their changes and it was annoying to have the change appear under the UI.
Also using this in zoomToGPXLayer.
2015-02-20 14:59:40 -05:00
ad8c381301
WIP: handle conflicting local tag deletion
...
re: https://github.com/openstreetmap/iD/pull/2489#discussion-diff-22490581
2015-02-20 12:43:47 -05:00
0a1dd4b338
WIP: simplify
2015-02-20 11:21:47 -05:00
38b50a347e
WIP: Fix tests, simplify mergeChildNodes
2015-02-17 22:10:47 -05:00
ebe5484e22
WIP: MergeRemoteChanges merges way childnodes
2015-02-17 00:51:49 -05:00
cdd0ca1acf
WIP: Use history.perform/replace/pop instead of context.perform
...
This means
* no more weird saves to localStoage of partially merged graphs
* pop cleanly cancels back to history state before merges happen
(removed the annotated undo states)
2015-02-17 00:47:12 -05:00
6638f6806e
WIP: changes to "download changeset"
...
* use original changeset before conflict resolutions
* don't cancel the conflict resolution ui
2015-02-16 15:12:42 -05:00
663ed92508
WIP: code cleanup, use difference.summary()
...
filling the toCheck list from summary() means that moved vertices are
treated as a change to the parent way, instead of changes to each node
TODO: need to conflict check each node, but at least now they are
fetched with a single API call to fetch the way, and can be reported
as a single conflict in the ui..
2015-02-16 14:53:51 -05:00
781db91fbc
make clean to remove old chaintool field
2015-02-14 11:33:16 -05:00
b36c9df610
field service:bicycle:chaintool changed to chain_tool
...
(re: #2497 )
2015-02-14 11:29:43 -05:00
d755145ae6
WIP: usernames in messages, show # of total
2015-02-14 11:20:19 -05:00
0b083f60b7
Switch landuse=farm to landuse=farmland in category list
...
(re: #2478 )
2015-02-13 12:22:43 -05:00
60410f7ee7
Remove point, vertex from generic landuse preset
...
(closes #2530 )
2015-02-13 12:12:58 -05:00
9aab74c187
Test; simplify
2015-02-12 10:24:40 -08:00
c9162ea65e
Extend protection to multipolygon outer ways
2015-02-12 10:21:24 -08:00
0953475f04
Don't delete ways from route/boundary relations
2015-02-12 10:21:23 -08:00
5561ebdb14
version
2015-02-12 06:30:23 -05:00
012a49c5ec
Update release instructions
2015-02-11 15:09:07 -05:00
1ad25c3dcd
1.7.0
2015-02-11 14:40:28 -05:00
26764be63a
Update translations
2015-02-11 14:39:39 -05:00
34642526ff
jshint
2015-02-10 14:41:06 -05:00
01fc554809
remove testing code
2015-02-10 13:25:54 -05:00
a4a5812816
style cleanup
2015-02-10 13:24:10 -05:00
58e2e07f9f
fix background color on loader gif
2015-02-10 12:22:07 -05:00
60769d5bcc
css cleanup
2015-02-10 12:21:40 -05:00
72cdf07b6a
remove more transitions
2015-02-10 11:51:01 -05:00
a46805c3cb
remove distracting transitions
2015-02-10 11:45:23 -05:00
744346398a
style cleanup
2015-02-10 11:08:01 -05:00
5bff37f11b
1.6.3
2015-02-09 22:24:20 -05:00
5812663134
Update imagery
2015-02-09 20:48:28 -05:00
e98b822b05
Update translations
2015-02-09 20:47:40 -05:00
e94d089526
fix modals
2015-02-09 18:11:38 -05:00
094c46dcfb
fix order issues
2015-02-09 17:49:58 -05:00
7f9d1437d2
zoom to conflict on active
2015-02-09 17:28:22 -05:00
cef46853ea
rework list interactions
2015-02-09 15:20:29 -05:00
e49ebe2784
rework save UI
2015-02-09 14:28:55 -05:00
65425cb738
Fix typo in smoothness.json: should be "impassable"
...
(closes #2523 )
2015-02-09 13:22:22 -05:00
c1d393302a
fix close button
2015-02-06 19:35:53 -05:00
be8b3daae4
remove dev code
2015-02-06 19:10:48 -05:00
d141827c3e
Merge branch 'master' into conflict-resolution-ui
2015-02-06 19:08:50 -05:00
78e4271071
finish basic layout/style pass
2015-02-06 19:07:57 -05:00
6d82ae4146
add iD.geo.Extent#contains
2015-02-06 13:56:51 -05:00
54594cd296
unzorro vertices that have moved past an endpoint
...
(while this works, it causes jerky confusing movement when moving the way,
so probably taking a different approach involving point scaling)
2015-02-06 10:31:35 -05:00
77a24717cc
Merge pull request #2522 from mapillary/mapillary_apiv2
...
upgrading to Mapillary API v2 calls
2015-02-06 05:36:20 -05:00
2c732d5ed7
removing log
2015-02-06 10:39:42 +02:00
f3e9b0f434
upgrading to Mapillary API v2 cals
2015-02-06 10:37:30 +02:00
158dbab0b1
Merge pull request #2521 from openstreetmap/round-tooltips
...
add rounded tooltips
2015-02-05 18:09:28 -05:00
f273650963
add rounded tooltips
2015-02-05 18:05:24 -05:00
3b88fe999b
Change description for amenity=farm to "Farmland"
2015-02-03 12:42:36 -05:00
Bryan Housel