From 50f7a5dcfcdfe2ceb75307cde3fa4cd10804204d Mon Sep 17 00:00:00 2001 From: Richard Fairhurst Date: Fri, 12 Oct 2012 00:32:13 +0100 Subject: [PATCH] Tagging work in progress --- README.md | 2 +- docs/todo.txt | 3 + index.html | 22 +++--- js/iD/Controller.js | 18 ++++- js/iD/Entity.js | 9 ++- js/iD/controller/edit/EditBaseState.js | 21 ++++- js/iD/styleparser/Style.js | 2 +- js/iD/tags/PresetList.js | 50 ++++++++++++ js/iD/tags/TagEditor.js | 100 ++++++++++++++++++++++++ presets/editors/bus.json | 2 + presets/editors/cycle_route.json | 20 +++++ presets/editors/cycling.json | 12 +++ presets/editors/rail.json | 2 + presets/editors/road.json | 11 +++ presets/mapzen-license.txt | 25 ++++++ presets/nodes.json | 2 + presets/ways.json | 53 +++++++++++++ presets/ways/highway__bridleway.png | Bin 0 -> 5283 bytes presets/ways/highway__cycleway.png | Bin 0 -> 2807 bytes presets/ways/highway__footway.png | Bin 0 -> 2730 bytes presets/ways/highway__light_rail.png | Bin 0 -> 4643 bytes presets/ways/highway__living_street.png | Bin 0 -> 2532 bytes presets/ways/highway__motorway.png | Bin 0 -> 2184 bytes presets/ways/highway__pedestrian.png | Bin 0 -> 3337 bytes presets/ways/highway__primary.png | Bin 0 -> 2972 bytes presets/ways/highway__residential.png | Bin 0 -> 2418 bytes presets/ways/highway__secondary.png | Bin 0 -> 2687 bytes presets/ways/highway__service.png | Bin 0 -> 4123 bytes presets/ways/highway__tertiary.png | Bin 0 -> 2867 bytes presets/ways/highway__track.png | Bin 0 -> 2986 bytes presets/ways/highway__trunk.png | Bin 0 -> 3070 bytes presets/ways/highway__unclassified.png | Bin 0 -> 2292 bytes presets/ways/railway__abandoned.png | Bin 0 -> 4680 bytes presets/ways/railway__construction.png | Bin 0 -> 4833 bytes presets/ways/railway__disused.png | Bin 0 -> 4450 bytes presets/ways/railway__monorail.png | Bin 0 -> 3598 bytes presets/ways/railway__narrow_gauge.png | Bin 0 -> 4564 bytes presets/ways/railway__preserved.png | Bin 0 -> 5435 bytes presets/ways/railway__rail.png | Bin 0 -> 4943 bytes presets/ways/railway__spur.png | Bin 0 -> 5541 bytes presets/ways/railway__tram.png | Bin 0 -> 4612 bytes presets/ways/waterway__canal.png | Bin 0 -> 6048 bytes presets/ways/waterway__river.png | Bin 0 -> 5251 bytes presets/ways/waterway__stream.png | Bin 0 -> 5653 bytes 44 files changed, 334 insertions(+), 20 deletions(-) create mode 100644 js/iD/tags/PresetList.js create mode 100644 js/iD/tags/TagEditor.js create mode 100644 presets/editors/bus.json create mode 100644 presets/editors/cycle_route.json create mode 100644 presets/editors/cycling.json create mode 100644 presets/editors/rail.json create mode 100644 presets/editors/road.json create mode 100644 presets/mapzen-license.txt create mode 100644 presets/nodes.json create mode 100644 presets/ways.json create mode 100644 presets/ways/highway__bridleway.png create mode 100644 presets/ways/highway__cycleway.png create mode 100644 presets/ways/highway__footway.png create mode 100644 presets/ways/highway__light_rail.png create mode 100644 presets/ways/highway__living_street.png create mode 100644 presets/ways/highway__motorway.png create mode 100644 presets/ways/highway__pedestrian.png create mode 100644 presets/ways/highway__primary.png create mode 100644 presets/ways/highway__residential.png create mode 100644 presets/ways/highway__secondary.png create mode 100644 presets/ways/highway__service.png create mode 100644 presets/ways/highway__tertiary.png create mode 100644 presets/ways/highway__track.png create mode 100644 presets/ways/highway__trunk.png create mode 100644 presets/ways/highway__unclassified.png create mode 100644 presets/ways/railway__abandoned.png create mode 100644 presets/ways/railway__construction.png create mode 100644 presets/ways/railway__disused.png create mode 100644 presets/ways/railway__monorail.png create mode 100644 presets/ways/railway__narrow_gauge.png create mode 100644 presets/ways/railway__preserved.png create mode 100644 presets/ways/railway__rail.png create mode 100644 presets/ways/railway__spur.png create mode 100644 presets/ways/railway__tram.png create mode 100644 presets/ways/waterway__canal.png create mode 100644 presets/ways/waterway__river.png create mode 100644 presets/ways/waterway__stream.png diff --git a/README.md b/README.md index 6c4efd902..1fc4c14bf 100644 --- a/README.md +++ b/README.md @@ -48,6 +48,6 @@ Scoping in JavaScript is famously broken: Dojo's lang.hitch method will save you Instance methods and variables _always_ need to be accessed with 'this.'. This is a fairly frequent gotcha if you're coming from another language. -The [Dojo site](http://dojotoolkit.org/) has lots of documentation. iD currently uses Dojo 1.7.2 - this has a much better module architecture (AMD) than previously. +The [Dojo site](http://dojotoolkit.org/) has lots of documentation. iD currently uses Dojo 1.8 - this has a much better module architecture (AMD) than previously. Come on in, the water's lovely. More help? Ping RichardF on IRC (irc.oftc.net, in #osm-dev or #osm), on the OSM mailing lists or at richard@systemeD.net. diff --git a/docs/todo.txt b/docs/todo.txt index 36e56b1ac..2f8dcd48e 100755 --- a/docs/todo.txt +++ b/docs/todo.txt @@ -18,6 +18,9 @@ Renderer to do * Node headings (for locks etc.) * Dragging needs tolerance (i.e. less than n pixels and n seconds) +Tagging to do +* dijitTooltipConnector is wrong when an entityUI is clicked + ControllerStates to do: * Try to share as much code as possible * Draw way controller states: diff --git a/index.html b/index.html index 1bedc15da..b7a49a894 100755 --- a/index.html +++ b/index.html @@ -4,12 +4,12 @@ iD - - - + + + - +