potlatch2.git
8 years agoMerge pull request #6 from jetthe/3715
systemed [Thu, 14 Jul 2011 16:03:17 +0000 (09:03 -0700)]
Merge pull request #6 from jetthe/3715

Moved pitchSport to make it usable in features. Fixes #3715.

8 years agoAllow users to load traces that aren't theirs
Richard Fairhurst [Thu, 14 Jul 2011 15:59:07 +0000 (16:59 +0100)]
Allow users to load traces that aren't theirs

8 years agoUpdate all layers when jumping to a place, and mark updateCoord methods as private...
Richard Fairhurst [Thu, 14 Jul 2011 15:58:01 +0000 (16:58 +0100)]
Update all layers when jumping to a place, and mark updateCoord methods as private so we're not tempted to use them from outside

8 years agoIgnore generated/ if git puts it in resources/
Richard Fairhurst [Thu, 14 Jul 2011 15:57:00 +0000 (16:57 +0100)]
Ignore generated/ if git puts it in resources/

8 years agoMoved pitchSport to make it usable in features. Fixes #3715.
Jonas Tull [Thu, 14 Jul 2011 13:59:20 +0000 (15:59 +0200)]
Moved pitchSport to make it usable in features. Fixes #3715.

8 years agoMerge pull request #4 from jetthe/map_features
systemed [Sun, 10 Jul 2011 13:19:25 +0000 (06:19 -0700)]
Merge pull request #4 from jetthe/map_features

Fixes #3870, #3881 and #3882

8 years agoSelecting and unselecting an empty input field in simple editor shouldn't trig TAG_CH...
Jonas Tull [Wed, 6 Jul 2011 13:53:43 +0000 (15:53 +0200)]
Selecting and unselecting an empty input field in simple editor shouldn't trig TAG_CHANGED as it may trigger an infinite loop.

8 years agoAdded category=Naming to simpleOperator and simpleBrand to make them more compliant.
Jonas Tull [Sun, 3 Jul 2011 21:14:13 +0000 (23:14 +0200)]
Added category=Naming to simpleOperator and simpleBrand to make them more compliant.

8 years agoExpanded scheme for fuel:. Also fixes OSM-Trac #3881.
Jonas Tull [Sun, 3 Jul 2011 19:21:41 +0000 (21:21 +0200)]
Expanded scheme for fuel:. Also fixes OSM-Trac #3881.

8 years agoChanged cycleway=segregated to segregated=yes. Fixes OSM-Trac #3870.
Jonas Tull [Sun, 3 Jul 2011 19:00:03 +0000 (21:00 +0200)]
Changed cycleway=segregated to segregated=yes. Fixes OSM-Trac #3870.

8 years agoFix of erroneous input type (operator). Now using simpleOperator for freetext input.
Jonas Tull [Sun, 3 Jul 2011 18:27:18 +0000 (20:27 +0200)]
Fix of erroneous input type (operator). Now using simpleOperator for freetext input.

8 years agoFirst step into reducing operator/brand clutter in preset fiels.
jonas@dalom.com [Sun, 3 Jul 2011 18:14:57 +0000 (20:14 +0200)]
First step into reducing operator/brand clutter in preset fiels.

8 years agoFix #3858 in penance for being a grouchy old sod
Richard Fairhurst [Sun, 26 Jun 2011 20:11:32 +0000 (21:11 +0100)]
Fix #3858 in penance for being a grouchy old sod

8 years agoRestore 'disabled' attribute.
Richard Fairhurst [Tue, 21 Jun 2011 16:09:13 +0000 (17:09 +0100)]
Restore 'disabled' attribute.

8 years agoUse array.forEach when iterating over vectors.xml to avoid scoping issues.
Richard Fairhurst [Tue, 21 Jun 2011 15:38:35 +0000 (16:38 +0100)]
Use array.forEach when iterating over vectors.xml to avoid scoping issues.

8 years agoRemember "no I don't want any background imagery" between sessions.
Richard Fairhurst [Tue, 21 Jun 2011 14:59:38 +0000 (15:59 +0100)]
Remember "no I don't want any background imagery" between sessions.

8 years agoRestore previous code to appendNode/prependNode.
Richard Fairhurst [Tue, 21 Jun 2011 14:57:54 +0000 (15:57 +0100)]
Restore previous code to appendNode/prependNode.
We need relative positions because MergeWaysAction 'groups' its node additions at the end of the way, so using way.length will get the original length of the way.

8 years agoProper fix for Condition bug
Richard Fairhurst [Sun, 19 Jun 2011 11:01:18 +0000 (12:01 +0100)]
Proper fix for Condition bug

8 years agoDon't deselect on panning
Richard Fairhurst [Sun, 19 Jun 2011 10:55:50 +0000 (11:55 +0100)]
Don't deselect on panning

8 years agoSAVE YOUR FUCKING WORK, DUDES
Richard Fairhurst [Sun, 19 Jun 2011 09:52:39 +0000 (10:52 +0100)]
SAVE YOUR FUCKING WORK, DUDES

8 years agoDon't choke if the BugConnection returns bogus JSON
Richard Fairhurst [Sun, 19 Jun 2011 09:50:05 +0000 (10:50 +0100)]
Don't choke if the BugConnection returns bogus JSON

8 years agoDon't choke if the user adds two fields in succession
Richard Fairhurst [Sun, 19 Jun 2011 09:49:35 +0000 (10:49 +0100)]
Don't choke if the user adds two fields in succession

8 years agoFix =no MapCSS check. This must be the longest-standing bug in P2...
Richard Fairhurst [Sat, 18 Jun 2011 08:01:55 +0000 (09:01 +0100)]
Fix =no MapCSS check. This must be the longest-standing bug in P2...

8 years agoVersion 2.2. 2.2
Richard Fairhurst [Fri, 17 Jun 2011 17:42:27 +0000 (18:42 +0100)]
Version 2.2.

8 years agoMerge branch 'refactor'
Richard Fairhurst [Fri, 17 Jun 2011 17:36:52 +0000 (18:36 +0100)]
Merge branch 'refactor'

8 years agoDon't die if user undoes way creation while in DrawWay.
Richard Fairhurst [Fri, 17 Jun 2011 16:18:37 +0000 (17:18 +0100)]
Don't die if user undoes way creation while in DrawWay.

8 years agoMake Markers selectable again.
Richard Fairhurst [Fri, 17 Jun 2011 16:09:05 +0000 (17:09 +0100)]
Make Markers selectable again.

8 years agoPrevent single-node ways from being created by undo.
Richard Fairhurst [Fri, 17 Jun 2011 15:48:50 +0000 (16:48 +0100)]
Prevent single-node ways from being created by undo.
Could be polished more but the undo system makes it enough of a brainfuck that this'll do for now.

8 years agoFix tab selection bug
Richard Fairhurst [Fri, 17 Jun 2011 08:55:20 +0000 (09:55 +0100)]
Fix tab selection bug

8 years agoBetter handling of conflicting tags when merging and editing ways and nodes
Richard Fairhurst [Thu, 16 Jun 2011 18:55:37 +0000 (19:55 +0100)]
Better handling of conflicting tags when merging and editing ways and nodes

8 years agoNot screwed up any more. At least I think not.
Richard Fairhurst [Wed, 15 Jun 2011 22:29:35 +0000 (23:29 +0100)]
Not screwed up any more. At least I think not.

8 years agoUnify selection ControllerStates so they can work on either background or editable...
Richard Fairhurst [Wed, 15 Jun 2011 22:28:18 +0000 (23:28 +0100)]
Unify selection ControllerStates so they can work on either background or editable objects

8 years agoImprove selection for background objects and tidy ControllerState layer handling
Richard Fairhurst [Wed, 15 Jun 2011 20:29:43 +0000 (21:29 +0100)]
Improve selection for background objects and tidy ControllerState layer handling

8 years agoAuto-detect filetype based on extension
Richard Fairhurst [Wed, 15 Jun 2011 16:12:20 +0000 (17:12 +0100)]
Auto-detect filetype based on extension

8 years agoWhoops
Richard Fairhurst [Wed, 15 Jun 2011 14:48:29 +0000 (15:48 +0100)]
Whoops

8 years agoMerge remote-tracking branch 'gravitystorm/fix_stylesheets' into refactor
Richard Fairhurst [Wed, 15 Jun 2011 14:10:12 +0000 (15:10 +0100)]
Merge remote-tracking branch 'gravitystorm/fix_stylesheets' into refactor

8 years agoMore subparts for network and enhanced stylesheets
Andy Allan [Wed, 15 Jun 2011 14:02:37 +0000 (15:02 +0100)]
More subparts for network and enhanced stylesheets

8 years agoDirection arrows on network and enhanced styles
Andy Allan [Wed, 15 Jun 2011 13:58:29 +0000 (14:58 +0100)]
Direction arrows on network and enhanced styles

8 years agoFix up the (legendary) runway rendering
Andy Allan [Wed, 15 Jun 2011 13:57:58 +0000 (14:57 +0100)]
Fix up the (legendary) runway rendering

8 years agoUse a plain old URLRequest for importing
Richard Fairhurst [Wed, 15 Jun 2011 13:28:47 +0000 (14:28 +0100)]
Use a plain old URLRequest for importing

8 years agoFix refactoring issues in potlatch2.mxml
Richard Fairhurst [Wed, 15 Jun 2011 12:43:22 +0000 (13:43 +0100)]
Fix refactoring issues in potlatch2.mxml

8 years agoFix railways to use subparts on the main style too
Andy Allan [Wed, 15 Jun 2011 11:47:17 +0000 (12:47 +0100)]
Fix railways to use subparts on the main style too

8 years agoMake the license highlighting use a 'status' subpart
Andy Allan [Wed, 15 Jun 2011 11:46:54 +0000 (12:46 +0100)]
Make the license highlighting use a 'status' subpart

8 years agoMerge remote-tracking branch 'gravitystorm/fix_stylesheets' into refactor
Richard Fairhurst [Wed, 15 Jun 2011 11:46:08 +0000 (12:46 +0100)]
Merge remote-tracking branch 'gravitystorm/fix_stylesheets' into refactor

8 years agoMove the various way highlighting to their own subpart
Andy Allan [Wed, 15 Jun 2011 11:01:10 +0000 (12:01 +0100)]
Move the various way highlighting to their own subpart

8 years agoDrop the interactive stuff from opencyclemap.css and use core_interactive instead
Andy Allan [Wed, 15 Jun 2011 10:55:18 +0000 (11:55 +0100)]
Drop the interactive stuff from opencyclemap.css and use core_interactive instead

8 years agoChoose whether layers are interactive (i.e. objects can be selected). After all,...
Richard Fairhurst [Wed, 15 Jun 2011 10:45:54 +0000 (11:45 +0100)]
Choose whether layers are interactive (i.e. objects can be selected). After all, you don't want to be able to select a GPS track, you want to trace it by clicking along it.

8 years agoFix route highlighting
Andy Allan [Wed, 15 Jun 2011 10:45:17 +0000 (11:45 +0100)]
Fix route highlighting

8 years agouse selectors for bridges, tunnels and arrows
Andy Allan [Wed, 15 Jun 2011 10:45:05 +0000 (11:45 +0100)]
use selectors for bridges, tunnels and arrows

8 years agoFix railways to have a separate dashes layer
Andy Allan [Wed, 15 Jun 2011 10:44:03 +0000 (11:44 +0100)]
Fix railways to have a separate dashes layer

8 years agoFix casing widths in a not-completely-scientific way. I suspect in most cases ~1...
Andy Allan [Wed, 15 Jun 2011 10:43:15 +0000 (11:43 +0100)]
Fix casing widths in a not-completely-scientific way. I suspect in most cases ~1 was what was intended anyway

8 years agoRemove trace statement
Richard Fairhurst [Sun, 12 Jun 2011 18:58:25 +0000 (19:58 +0100)]
Remove trace statement

8 years agoBetter support for MapCSS 0.2, including subparts
Richard Fairhurst [Sun, 12 Jun 2011 18:55:39 +0000 (19:55 +0100)]
Better support for MapCSS 0.2, including subparts

8 years agoNew RuleChain object to replace previous nested array within StyleChooser
Richard Fairhurst [Sun, 12 Jun 2011 13:42:04 +0000 (14:42 +0100)]
New RuleChain object to replace previous nested array within StyleChooser

8 years agoControl-drag for selection by area
Richard Fairhurst [Sun, 12 Jun 2011 06:59:00 +0000 (07:59 +0100)]
Control-drag for selection by area

8 years agoMerge remote-tracking branch 'gravitystorm/snapshotserver' into refactor
Richard Fairhurst [Sat, 11 Jun 2011 13:52:23 +0000 (14:52 +0100)]
Merge remote-tracking branch 'gravitystorm/snapshotserver' into refactor

8 years agoDon't freak out when backspacing a value then deleting the whole tag
Richard Fairhurst [Sat, 11 Jun 2011 10:26:59 +0000 (11:26 +0100)]
Don't freak out when backspacing a value then deleting the whole tag

8 years agoProvide a new 'View data' button in the upload dialogue.
Richard Fairhurst [Sat, 11 Jun 2011 10:18:58 +0000 (11:18 +0100)]
Provide a new 'View data' button in the upload dialogue.
If the upload freaks out and refuses to save, the user can at least copy and paste the raw XML for later use.

8 years agoMake 'delete' work on (new tag)=(new value)
Richard Fairhurst [Sat, 11 Jun 2011 09:38:02 +0000 (10:38 +0100)]
Make 'delete' work on (new tag)=(new value)

8 years agoFix undo
Richard Fairhurst [Fri, 10 Jun 2011 20:25:51 +0000 (21:25 +0100)]
Fix undo

8 years agoFix issue where removing node B from an ABA way would leave two As. Needs reasonably...
Richard Fairhurst [Fri, 10 Jun 2011 20:14:09 +0000 (21:14 +0100)]
Fix issue where removing node B from an ABA way would leave two As. Needs reasonably thorough testing please ;)

8 years agowork in progress for marking nodes as complete
Andy Allan [Fri, 10 Jun 2011 16:55:35 +0000 (17:55 +0100)]
work in progress for marking nodes as complete

8 years agoselected background node
Andy Allan [Fri, 10 Jun 2011 16:54:55 +0000 (17:54 +0100)]
selected background node

8 years agoCorrect the _status value
Richard Fairhurst [Fri, 10 Jun 2011 15:09:28 +0000 (16:09 +0100)]
Correct the _status value

8 years agoBeginnings of status API support, including WTFE and dedicated UI for selecting it
Richard Fairhurst [Fri, 10 Jun 2011 14:51:45 +0000 (15:51 +0100)]
Beginnings of status API support, including WTFE and dedicated UI for selecting it

8 years agoHandle 'tags' in shapefiles, and don't create dupes on pull-through.
Richard Fairhurst [Fri, 10 Jun 2011 09:09:04 +0000 (10:09 +0100)]
Handle 'tags' in shapefiles, and don't create dupes on pull-through.
Also, we really need TagTransform for this. ;)

8 years agoUnderstand shapefiles in different projections (notably OSGB)
Richard Fairhurst [Fri, 10 Jun 2011 08:18:44 +0000 (09:18 +0100)]
Understand shapefiles in different projections (notably OSGB)

8 years agoFix closure problem when importing multiple files
Richard Fairhurst [Thu, 9 Jun 2011 17:28:58 +0000 (18:28 +0100)]
Fix closure problem when importing multiple files

8 years agoDon't ask for the requestToken if we haven't told OAuthPanel which connection to...
Richard Fairhurst [Thu, 9 Jun 2011 15:49:24 +0000 (16:49 +0100)]
Don't ask for the requestToken if we haven't told OAuthPanel which connection to use yet

8 years agoEditController can now throw AttentionEvents too, so they don't all have to go throug...
Richard Fairhurst [Thu, 9 Jun 2011 15:15:44 +0000 (16:15 +0100)]
EditController can now throw AttentionEvents too, so they don't all have to go through a Connection

8 years agoPull-through wasn't working because appendNode doesn't force a redraw - fix that
Richard Fairhurst [Thu, 9 Jun 2011 14:38:00 +0000 (15:38 +0100)]
Pull-through wasn't working because appendNode doesn't force a redraw - fix that

8 years agoMake wayuis, nodeuis and markeruis private
Richard Fairhurst [Thu, 9 Jun 2011 14:16:43 +0000 (15:16 +0100)]
Make wayuis, nodeuis and markeruis private

8 years agoAdd a panel for background features - based on the marker panel
Andy Allan [Fri, 3 Jun 2011 12:47:36 +0000 (13:47 +0100)]
Add a panel for background features - based on the marker panel

8 years agoAdd the ability to select, but not edit, a background way
Andy Allan [Thu, 2 Jun 2011 13:44:32 +0000 (14:44 +0100)]
Add the ability to select, but not edit, a background way

8 years agoDocumentation
Andy Allan [Thu, 2 Jun 2011 13:39:02 +0000 (14:39 +0100)]
Documentation

8 years agoNew SnapshotLoader and associated connections
Andy Allan [Thu, 2 Jun 2011 13:38:04 +0000 (14:38 +0100)]
New SnapshotLoader and associated connections

8 years agoLittle tweaks to documentation
Andy Allan [Thu, 2 Jun 2011 13:35:22 +0000 (14:35 +0100)]
Little tweaks to documentation

8 years agoMerge remote branch 'gravitystorm/relationrevert'
Richard Fairhurst [Fri, 27 May 2011 14:00:27 +0000 (15:00 +0100)]
Merge remote branch 'gravitystorm/relationrevert'

8 years agoFix bug with relation revert handling - downloaded relations weren't being processed.
Andy Allan [Fri, 27 May 2011 13:05:31 +0000 (14:05 +0100)]
Fix bug with relation revert handling - downloaded relations weren't being processed.

8 years agoMerge remote branch 'gravitystorm/relationmembers'
Richard Fairhurst [Fri, 27 May 2011 11:25:45 +0000 (12:25 +0100)]
Merge remote branch 'gravitystorm/relationmembers'

8 years agoMerge remote branch 'gravitystorm/autocompletekeys'
Richard Fairhurst [Fri, 27 May 2011 11:25:40 +0000 (12:25 +0100)]
Merge remote branch 'gravitystorm/autocompletekeys'

8 years agoFix typo
Andy Allan [Fri, 27 May 2011 10:57:37 +0000 (11:57 +0100)]
Fix typo

8 years agoNo reason that I can see for bypassing the MainUndoStack for this one
Andy Allan [Fri, 27 May 2011 10:23:03 +0000 (11:23 +0100)]
No reason that I can see for bypassing the MainUndoStack for this one

8 years agoFix setting a route relation role (forward/backward) via the simple interface - was...
Andy Allan [Fri, 27 May 2011 10:19:29 +0000 (11:19 +0100)]
Fix setting a route relation role (forward/backward) via the simple interface - was causing runtime errors.

Also cast the relation so that in future this would be a compile-time error.

8 years agoAdd the freetext keys to the autocomplete list - now supports e.g. addr:housenumber
Andy Allan [Fri, 27 May 2011 09:48:26 +0000 (10:48 +0100)]
Add the freetext keys to the autocomplete list - now supports e.g. addr:housenumber

8 years agoRemove VectorLayer.as. Cursory check suggests all the vectorlayer-based refactoring...
Andy Allan [Thu, 26 May 2011 16:15:22 +0000 (17:15 +0100)]
Remove VectorLayer.as. Cursory check suggests all the vectorlayer-based refactoring is complete.

8 years agoReimplement pullThrough in a more undo-friendly fashion - only one undo to reverse...
Andy Allan [Thu, 26 May 2011 16:09:35 +0000 (17:09 +0100)]
Reimplement pullThrough in a more undo-friendly fashion - only one undo to reverse it all

8 years agoRe-enable loading gpx files from vectors.xml
Andy Allan [Thu, 26 May 2011 15:10:41 +0000 (16:10 +0100)]
Re-enable loading gpx files from vectors.xml

8 years agoRefactor all the Importer classes to use connections instead of vectorlayers
Andy Allan [Thu, 26 May 2011 15:03:39 +0000 (16:03 +0100)]
Refactor all the Importer classes to use connections instead of vectorlayers

8 years agoWhile I notice it, simplify.as adds undostack items when e.g. importing GPX into...
Andy Allan [Thu, 26 May 2011 13:56:31 +0000 (14:56 +0100)]
While I notice it, simplify.as adds undostack items when e.g. importing GPX into background layers

8 years agoRemove VectorLayer import statements from refactored files
Andy Allan [Thu, 26 May 2011 13:19:30 +0000 (14:19 +0100)]
Remove VectorLayer import statements from refactored files

8 years agoRemove VectorLayer from EditController and fix up references in various sidebar panels
Andy Allan [Thu, 26 May 2011 13:13:34 +0000 (14:13 +0100)]
Remove VectorLayer from EditController and fix up references in various sidebar panels

8 years agoexplain some of the variables
Andy Allan [Tue, 24 May 2011 15:26:36 +0000 (16:26 +0100)]
explain some of the variables

8 years agoRefactor the comments
Andy Allan [Tue, 24 May 2011 14:44:39 +0000 (15:44 +0100)]
Refactor the comments

8 years agoRefactor Trace.as
Andy Allan [Tue, 24 May 2011 14:31:08 +0000 (15:31 +0100)]
Refactor Trace.as

8 years agoCurvies, not squaries
Andy Allan [Tue, 24 May 2011 14:29:43 +0000 (15:29 +0100)]
Curvies, not squaries

8 years agoShould we remove Globals access from Connection?
Andy Allan [Tue, 24 May 2011 13:41:31 +0000 (14:41 +0100)]
Should we remove Globals access from Connection?

8 years agoMake paintContainer private, and add a method to access all MapPaint objects
Andy Allan [Tue, 24 May 2011 13:10:56 +0000 (14:10 +0100)]
Make paintContainer private, and add a method to access all MapPaint objects

8 years agoUpdate connections to use instance copies of apiBaseURL. Untested, but allows docs...
Andy Allan [Tue, 24 May 2011 11:44:53 +0000 (12:44 +0100)]
Update connections to use instance copies of apiBaseURL. Untested, but allows docs to compile again.

8 years agoRe-enable VectorSourceDialog
Andy Allan [Tue, 24 May 2011 11:28:21 +0000 (12:28 +0100)]
Re-enable VectorSourceDialog