72536229c7
Merge branch 'master' into presets
...
Conflicts:
test/index.html
2013-02-01 12:03:40 -05:00
5f8e7ec8cc
Merge branch 'master' of github.com:systemed/iD
2013-01-31 19:20:32 -05:00
bbccec75be
Convert Hash to a behavior
2013-01-31 18:28:24 -05:00
9f37249393
Merge branch 'master' into presets
2013-01-31 17:20:15 -05:00
7ea7326f92
Extract Select behavior
2013-01-31 15:56:24 -05:00
116289ae53
minor fixes.
2013-01-31 15:54:14 -05:00
ecb27eaf2f
Merge branch 'master' into presets
...
Conflicts:
js/id/modes/select.js
2013-01-31 15:14:28 -05:00
5bd95f6e6a
Grab favorites, display them.
...
Show stuff nested in optional tags.
Fixes #582
2013-01-31 14:59:59 -05:00
c871361bad
Add preset search.
2013-01-31 13:50:19 -05:00
2613312d12
Add google analytics.
2013-01-31 13:30:54 -05:00
8bece3de15
Remove unused
2013-01-31 12:55:35 -05:00
15e1bee3ec
Move controller
2013-01-31 12:45:39 -05:00
514ec1e28b
Move validate
2013-01-31 12:44:11 -05:00
3605895dfa
ChangeEntityTags -> ChangeTags
2013-01-31 12:41:29 -05:00
4e7ed7250b
Add josm converter and converted, switch to it.
2013-01-31 12:18:06 -05:00
6f7079d11c
AddWay/AddNode -> AddEntity
2013-01-31 12:06:21 -05:00
1bfe1359ec
AddWayNode -> AddVertex
2013-01-31 12:06:21 -05:00
806ec9fae3
Add google analytics.
2013-01-31 11:39:51 -05:00
bc59070ff3
Merge branch 'master' into presets
...
Conflicts:
js/id/util.js
2013-01-31 11:35:29 -05:00
e63434f437
Rename, titles, edit distance
2013-01-30 17:41:06 -05:00
2cb3e5849d
First shot at presets
...
This includes a first JSON scheme and a bad-looking UI currently in
inspector.
2013-01-30 17:30:04 -05:00
639f1b6977
Stub in splash screen ( #567 )
2013-01-30 16:44:27 -05:00
e381b6ab26
Extract AddMidpoint action
2013-01-30 15:47:33 -05:00
6576ec6501
Operation sprites
2013-01-30 11:56:49 -05:00
4ed44ef9f0
Micro translation framework.
2013-01-29 18:34:40 -05:00
65baf36143
Remove unused DragWay behavior
2013-01-29 13:19:04 -05:00
03de3ffba6
Move operation ( fixes #536 )
2013-01-29 13:18:23 -05:00
69d95a6082
Refactor operations
...
They're something distinct from actions. Actions are independent
of UI, operations are actions + UI (title, keybinding, modality,
etc.)
2013-01-29 12:05:52 -05:00
de7fad5803
Move remaining XML stuff to Connection
2013-01-27 21:50:08 -05:00
1f3319f7b0
Add circularize action. Fixes #491
2013-01-24 22:52:19 -05:00
dd03544a00
Extract AddWay behavior
2013-01-24 18:04:40 -05:00
18c7267010
Extract Draw behavior
...
Fixed some bugs but introduced others.
2013-01-24 17:00:48 -05:00
ce78e34b34
Merge, rename to radial menu and remove pi
2013-01-24 13:11:52 -05:00
2b4b8cb5fe
Merge pull request #468 from systemed/labels
...
Labels
2013-01-23 16:21:01 -08:00
8741e69c10
Add source switch
2013-01-23 17:19:19 -05:00
c337182791
Merge remote-tracking branch 'systemed/master' into labels
2013-01-23 17:00:30 -05:00
1a916ff506
Move keys to separate file, not working on osm.org yet.
2013-01-23 16:56:48 -05:00
3a48016e5f
Merge remote-tracking branch 'systemed/master' into labels
...
Conflicts:
js/id/util.js
2013-01-23 16:15:29 -05:00
d6d1709e7b
Trying out radial menus for operations UI ( #226 )
2013-01-23 15:34:04 -05:00
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
6f0b715c9f
Include new file
2013-01-23 10:35:01 -05:00
0afb564435
Merge remote-tracking branch 'systemed/master' into labels
...
Conflicts:
js/id/svg/lines.js
js/id/svg/surface.js
2013-01-20 20:37:00 -05:00
2ee07a3b74
Add iD.actions.AddRelationMember
2013-01-18 14:44:29 -08:00
efd829e396
Merge branch 'master' into labels
...
Conflicts:
js/id/renderer/map.js
js/id/svg/lines.js
2013-01-18 17:19:12 -05:00
d70b5c3891
Add rtree to index.html
2013-01-18 17:01:41 -05:00
3eaf4a46e0
Add CSS classes for relation memberships
...
An entity that is a member of a relation will have the classes
`member`, `member-role-<member role>`, and `member-type-<relation type>`.
The first use of these classes is to avoid filling multipolygon
member areas.
2013-01-17 15:17:40 -08:00
5a2444b551
Extract and fix extent/intersection calculations
...
Extents are now [[min x, min y], [max x, max y]].
2013-01-17 14:27:01 -08:00
9c007e24e3
Start work on label rendering
2013-01-17 15:14:22 -05:00
9a76b81125
First cut on multipolygon rendering
2013-01-17 11:57:30 -08:00
9b21fae8cb
Validation. This adds basic validation and display to commits
...
Included is
* Untagged POIs, ways, areas
* Tags that suggest that lines should be areas
2013-01-17 14:46:39 -05:00
Tom MacWright