Commit Graph

55 Commits

Author SHA1 Message Date
John Firebaugh
c8dcba31ad Auto-zoom to entity specified by id param 2013-04-18 14:24:10 -07:00
Ansis Brammanis
9983c0be43 make difference calculation stricter
Changed entities with the exact same properties no longer get counted as
modified.

issue #1287
2013-04-18 13:58:22 -04:00
John Firebaugh
ab56cc5207 Clean up how OAuth keys are handled
Connection defaults to osm.org URL and keys for the simple
case. Customization is done via connection.switch().

Externalize SourceSwitch's use of iD.data.keys.
2013-04-17 17:43:25 -07:00
John Firebaugh
dca9bec450 Move Connection to core 2013-04-17 17:35:34 -07:00
John Firebaugh
94e2c8d8d6 Prevent duplicate consecutive nodes (#1296) 2013-04-12 10:55:53 -04:00
John Firebaugh
05c659bdd7 Render oneway arrows for junction=roundabout (fixes #1255) 2013-04-05 12:27:36 -07:00
John Firebaugh
7100054707 Use preset names in commit dialog 2013-04-01 08:33:07 -07:00
Ansis Brammanis
0435c4793c better positioned walkthrough tooltips 2013-03-28 11:58:56 -04:00
John Firebaugh
f7fb12be76 Fix #1120, inconsistent undo for line/area drawing
Gulp!
2013-03-27 16:25:10 -07:00
Ansis Brammanis
2b4e260953 walkthrough now runnable in the middle of editing
history.toJSON and .fromJSON are now split out of.
history.save and .restore.
2013-03-27 11:52:50 -04:00
Ansis Brammanis
63edc30922 Revert "Use a temporary area tag for drawing. Fixes #1014"
This reverts commit 4184b503f9.
2013-03-18 14:02:21 -04:00
Tom MacWright
4184b503f9 Use a temporary area tag for drawing. Fixes #1014 2013-03-15 18:27:06 -04:00
John Firebaugh
66e1bdb47d Show tag editor for untagged entities that aren't new
Fixes #991.
2013-03-14 15:59:56 -07:00
John Firebaugh
4720a84d38 No-op a null tag merge
Reduces unnecessary node churn in Connect action.
2013-03-12 16:26:40 -07:00
John Firebaugh
3b3ee84a84 Specs for Way#areAdjacent 2013-03-12 16:22:30 -07:00
John Firebaugh
68cc99c412 Disable Move operation on incomplete relations (fixes #972) 2013-03-11 16:43:06 -07:00
Ansis Brammanis
6129fbf4f5 prevent creation of ways with duplicate segments or repeated nodes 2013-03-11 16:00:24 -04:00
John Firebaugh
711b867b61 Render waterway=riverbank as area 2013-03-10 18:25:25 -07:00
John Firebaugh
da37237955 Add man_made presets 2013-03-09 09:22:56 -08:00
Tom MacWright
c9b93bbd42 Merge branch 'master' of github.com:systemed/iD. Fixes #924 2013-03-08 14:07:18 -05:00
Tom MacWright
7925662079 Avoid writing undefined properties in JSON localStorage 2013-03-08 14:07:02 -05:00
John Firebaugh
fa01cfbbf0 Smarter tag conflict merging (fixes #943) 2013-03-08 11:00:14 -08:00
Tom MacWright
5838f05116 Merge tags without a space, fixes #941 2013-03-08 10:51:44 -05:00
Tom MacWright
0fafa340fe Start using d3 3.1.0
Update d3, use streams, d3.set, clip
Use clipping, fix side effects
2013-03-07 17:45:16 -05:00
John Firebaugh
bf90c1ae93 Render circular place=* as an unfilled area
Basically, give it area label placement, but line
behavior otherwise.

Test case: #id=w169604918&map=19.46/41.41402/-70.94773
2013-03-06 17:37:18 -08:00
Ansis Brammanis
928cade41b oneway markers on rivers and streams 2013-03-06 17:51:31 -05:00
John Firebaugh
dbe3020877 Remove outdated comment 2013-03-05 19:52:17 -08:00
John Firebaugh
e9b2563ad8 Force natural=coastline not to be an area (fixes #900) 2013-03-05 17:39:14 -08:00
Tom MacWright
71a4c5a383 Fix jshint errors - plz do not use unnecessary magic 2013-03-04 12:08:54 -05:00
Ansis Brammanis
eea85681be Fix tests 2013-02-28 14:24:51 -05:00
Ansis Brammanis
baa9dc6e5e Render unclosed areas correctly 2013-02-28 14:08:03 -05:00
John Firebaugh
f4b19133e7 Lint 2013-02-27 20:41:37 -08:00
Ansis Brammanis
bf1aaf2172 don't include just created parents in modified 2013-02-27 17:50:42 -05:00
Tom MacWright
ba45582e3c Removing unused arguments 2013-02-27 17:30:05 -05:00
Ansis Brammanis
8e6e860f87 Fix removing from tree 2013-02-19 18:06:18 -05:00
Ansis Brammanis
147fce1f49 Merge branch 'tree-intersects'
Conflicts:
	js/id/behavior/lasso.js
2013-02-15 13:40:01 -05:00
John Firebaugh
e3d9d3a4c4 Refine Way#isArea
Closed ways that are multipolygon inners shouldn't be
rendered as areas just because they have a source=* tag,
for example.
2013-02-13 16:44:36 -08:00
John Firebaugh
5e66307500 Fix incorrect parentWays after reloading a split way
When recalculating parent ways/relations during rebase, a
graph should not add modified or deleted entities as parents.
Such entities will already be correctly marked as parents or
not.

Graph had the correct behavior for deleted entities, but not for
modified entities. This had the effect that if you split a way
that was partially off screen, and then panned so that the way was
re-retrieved, Graph#rebase would mistakenly add back the original
way as a parent of all the nodes that were split into the new
section, making them appear as shared.

Fixes #751.
2013-02-13 16:03:23 -08:00
Ansis Brammanis
1050faab8f Only delete saved on hitting reset, fixes #744 2013-02-13 17:42:46 -05:00
Ansis Brammanis
8c1e0212f9 Fix rebasing and test 2013-02-13 16:08:39 -05:00
Ansis Brammanis
64c8ef626f Add general test for spatial tree 2013-02-13 15:10:48 -05:00
Ansis Brammanis
b80bbc1fbe Add tree test 2013-02-13 14:40:37 -05:00
Ansis Brammanis
9a4d4ab9c5 Retry queued entities after rebase 2013-02-13 14:16:18 -05:00
Ansis Brammanis
529b570c89 Merge remote-tracking branch 'systemed/master' into tree-intersects 2013-02-13 13:31:11 -05:00
Ansis Brammanis
a21b973a41 Fix saving deletions to storage, add tests 2013-02-13 12:42:51 -05:00
Ansis Brammanis
f2d6628547 Don't break rebasing with loading 2013-02-13 11:17:29 -05:00
Ansis Brammanis
9c65e58cc1 Tree handles entities with missing children 2013-02-13 10:23:30 -05:00
Ansis Brammanis
6baf6a6dd4 Move intersection tree to iD.Tree 2013-02-12 18:18:58 -05:00
Ansis Brammanis
9bd46af6ad Tree intersect now works with changes 2013-02-12 17:22:25 -05:00
Tom MacWright
915edc4569 Merge branch 'master' of github.com:systemed/iD 2013-02-12 16:35:53 -05:00