CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-03-19 09:33:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,611 Commits 2 Branches 0 Tags
ab7c1fa80aa41cee16ef29daed005c6b8171ff0f
Commit Graph

126 Commits

Author SHA1 Message Date
Tom MacWright
bd7f302730 Show deprecated tags in save commit, validate them, add deprecatedTags 
to entity type.
 2013-02-04 16:45:18 -05:00
Tom MacWright
3d8f2ffb84 Consistify syntax 2013-02-04 16:08:34 -05:00
Tom MacWright
e5ad28feb7 JShint fixups 2013-02-04 12:10:23 -05:00
John Firebaugh
80a5a083b0 Remove unused 2013-02-02 19:57:36 -05:00
John Firebaugh
fc00f154a9 Dispatch a change event on merge 2013-02-02 19:47:56 -05:00
John Firebaugh
11d723819d Difference#extantIDs 2013-02-02 19:47:56 -05:00
John Firebaugh
ddc5e324f6 Extract iD.Difference 
iD.Difference represents the difference between two graphs.
It knows how to calculate the set of entities that were
created, modified, or deleted, and also contains the logic
for recursively extending a difference to the complete set
of entities that will require a redraw, taking into account
child and parent relationships.

Additionally, all history mutators now return a difference.
 2013-02-02 19:47:56 -05:00
John Firebaugh
20730e5f1a Entity#mergeTags 2013-02-01 17:31:32 -05:00
Ansis Brammanis
846cf6e43d Add difference tests 2013-01-31 13:37:54 -05:00
Ansis Brammanis
5c8aa46e1f Fix graph.difference 2013-01-31 12:47:02 -05:00
John Firebaugh
514ec1e28b Move validate 2013-01-31 12:44:11 -05:00
John Firebaugh
7e8126ded9 I18n for modes and operations 2013-01-31 11:20:41 -05:00
Ansis Brammanis
9862238a84 Fix graph.rebase() 2013-01-30 17:04:51 -05:00
Ansis Brammanis
2fa48df9a1 Small parentWays, parentRelations perf improvements 2013-01-30 16:09:15 -05:00
Ansis Brammanis
a317859b0f Don't re-add removed parentways, don't duplicate 2013-01-30 15:44:03 -05:00
Ansis Brammanis
1b5a1b8268 Merge takes an entities object, not graph 2013-01-30 14:20:39 -05:00
Ansis Brammanis
5a35b6bfa4 Fix difference 2013-01-30 14:11:54 -05:00
Ansis Brammanis
e08364d492 working parentRels 2013-01-30 13:18:44 -05:00
Ansis Brammanis
ba68a238fe Working rebase 2013-01-30 12:26:40 -05:00
Ansis Brammanis
6c1e4e5b4d Working more-efficient parentWays 2013-01-29 13:32:39 -05:00
Ansis Brammanis
7d32af5264 work towards using prototypes for entities 2013-01-29 12:49:00 -05:00
John Firebaugh
c5d691d79d Graph#rebase 2013-01-28 16:08:08 -05:00
John Firebaugh
08bd7e583a Define Relation#asJXON (allow relations to be saved) 2013-01-28 10:19:11 -05:00
John Firebaugh
f6ff3e678b Use osmId/Entity.id.toOSM 2013-01-28 10:16:51 -05:00
John Firebaugh
2ac0f1dc26 Don't rely on OSM IDs being in range of JS numbers 2013-01-28 10:15:17 -05:00
John Firebaugh
47ef222f38 Convert iD.format.XML to member functions 2013-01-27 21:50:08 -05:00
John Firebaugh
646c746991 Convert iD.format.GeoJSON to member functions 2013-01-27 21:50:07 -05:00
John Firebaugh
e09666bbdc Fixing draw mode bugs 
Disabling interactive draw undo for now. I know how to fix it
but it's a bit tricky. So undo will just drop you out to browse
mode for the time being.

Fixes #477.
Fixes #516.
 2013-01-26 15:24:14 -05:00
Tom MacWright
401fe94f2c Merge branch 'master' of github.com:systemed/iD 2013-01-25 18:49:01 -05:00
Tom MacWright
4e2124e74f jshint 2013-01-25 18:48:07 -05:00
Ansis Brammanis
8f8e3955b5 Revert "Use object.create for graph.entities" 
This reverts commit 78993bc080.
 2013-01-25 18:08:48 -05:00
Ansis Brammanis
db0ba2c88c Revert "Difference only changed entities" 
This reverts commit 74d006ea08.

Conflicts:

	js/id/graph/graph.js
 2013-01-25 18:05:38 -05:00
Tom MacWright
5645a48feb More jshint 2013-01-25 17:55:43 -05:00
John Firebaugh
c981fe5d80 Revert "Wrap all actions in Graph#update" 
This reverts commit 3105923371.

See #508.
 2013-01-25 16:17:26 -05:00
John Firebaugh
5ea855e18d Replace Graph#fetch with Graph#childNodes 
Having two kinds of Ways (fetched and non-fetched)
introduced some accidental complexity. This brings things
more in line with how parentWays/parentRelations work.

Fixes #73.
 2013-01-25 15:10:44 -05:00
Ansis Brammanis
74d006ea08 Difference only changed entities 2013-01-25 15:07:58 -05:00
Ansis Brammanis
78993bc080 Use object.create for graph.entities 2013-01-25 14:35:46 -05:00
John Firebaugh
3105923371 Wrap all actions in Graph#update 2013-01-25 13:43:35 -05:00
John Firebaugh
4874199401 Add Graph#update 
This can be used to reduce graph churn when there are
multiple changes to make.
 2013-01-25 13:27:33 -05:00
John Firebaugh
18c7267010 Extract Draw behavior 
Fixed some bugs but introduced others.
 2013-01-24 17:00:48 -05:00
Tom MacWright
32ea30c3fb Use isPoi for determining whether points are pois or not 2013-01-23 19:14:54 -05:00
John Firebaugh
278bb4a51c Fix some cases where a degenerate way was created 2013-01-23 12:40:27 -05:00
John Firebaugh
292c916cb1 Converting some actions to entity methods 
The guidelines here are:

Entity methods:
  return a modified entity
  don't necessarily maintain whole-graph consistency

Actions:
  return a modified graph
  always maintain whole-graph consistency
  call entity methods liberally
  generally don't call other actions
 2013-01-23 12:40:27 -05:00
John Firebaugh
8e92fffa1a Freeze loc 2013-01-23 10:07:10 -05:00
John Firebaugh
c263ebd4dc iD.util.geo => iD.geo 2013-01-22 18:20:20 -05:00
John Firebaugh
381794e7a1 Fix Relation#multipolygon for unmatched inner rings (fixes #461) 2013-01-22 17:54:57 -05:00
John Firebaugh
d74bf1e39a Use proper prototypal inheritance and less dynamic new 2013-01-22 17:38:52 -05:00
John Firebaugh
814c3608db Hook into undos in a different way 
This way doesn't depend on details of keybindings and
the undo button.

Also, implement this in DrawArea mode.
 2013-01-22 14:55:08 -05:00
Ansis Brammanis
a97a4e4617 Fix redrawing shared vertices 2013-01-20 19:05:53 -05:00
Brandon Liu
ded802049a add history.numChanges method. 
Use hasChanges/numChanges to toggle Save button and show confirmation dialog when navigating away from page.
 2013-01-19 23:16:48 -08:00