]> git.openstreetmap.org Git - potlatch2.git/log
potlatch2.git
11 years agoMerge remote-tracking branch 'gravitystorm/relation-fixing' into staging
Richard Fairhurst [Sat, 2 Apr 2011 16:44:08 +0000 (17:44 +0100)]
Merge remote-tracking branch 'gravitystorm/relation-fixing' into staging

11 years agoMove the connection fixing to a Before method so it applies to all the tests
Andy Allan [Sat, 2 Apr 2011 15:26:36 +0000 (16:26 +0100)]
Move the connection fixing to a Before method so it applies to all the tests

11 years agoCheck that relation appending member and setting member end up in the right place
Andy Allan [Sat, 2 Apr 2011 14:55:35 +0000 (15:55 +0100)]
Check that relation appending member and setting member end up in the right place

11 years agoAdd support for TMS tile-numbering scheme
Richard Fairhurst [Sat, 2 Apr 2011 14:39:07 +0000 (15:39 +0100)]
Add support for TMS tile-numbering scheme

11 years agoA little splice test to demonstrate the bug that the unit test will cover
Andy Allan [Sat, 2 Apr 2011 14:23:29 +0000 (15:23 +0100)]
A little splice test to demonstrate the bug that the unit test will cover

11 years agoFix the failing unit test
Andy Allan [Sat, 2 Apr 2011 14:12:09 +0000 (15:12 +0100)]
Fix the failing unit test

11 years agoMerge remote-tracking branch 'randomjunk/minor-updates'
Richard Fairhurst [Sat, 2 Apr 2011 12:52:44 +0000 (13:52 +0100)]
Merge remote-tracking branch 'randomjunk/minor-updates'

11 years agoEnlarge requested bbox by 20% on each side to make for easier panning; keep list...
Richard Fairhurst [Sat, 2 Apr 2011 12:49:31 +0000 (13:49 +0100)]
Enlarge requested bbox by 20% on each side to make for easier panning; keep list of loaded bboxes in memory; increase ways-in-memory limit to 3000. Overall, should reduce number of /map calls and make editing more seamless.

11 years agoAdd tests for AddMemberToRelationAction, but I can't get the main one working and...
Andy Allan [Tue, 29 Mar 2011 18:28:46 +0000 (19:28 +0100)]
Add tests for AddMemberToRelationAction, but I can't get the main one working and can't figure out why

11 years agoFix OS7 imagery definition (png -> jpg) -- fixes #3597
Dave Stubbs [Sat, 2 Apr 2011 10:43:47 +0000 (11:43 +0100)]
Fix OS7 imagery definition (png -> jpg) -- fixes #3597

11 years agoMake advanced tag panel listen to tag changes; fix issues with panel not responding...
Richard Fairhurst [Sat, 2 Apr 2011 09:53:05 +0000 (10:53 +0100)]
Make advanced tag panel listen to tag changes; fix issues with panel not responding correctly.

11 years agoConvert Relation.setMember to use the undo system. Fixes 3586. This stuff could do...
Andy Allan [Tue, 29 Mar 2011 19:47:16 +0000 (20:47 +0100)]
Convert Relation.setMember to use the undo system. Fixes 3586. This stuff could do with some functioning unit tests.

11 years agoOnly remove parent if the entity doesn't appear elsewhere in the members list.
Andy Allan [Tue, 29 Mar 2011 19:34:04 +0000 (20:34 +0100)]
Only remove parent if the entity doesn't appear elsewhere in the members list.

11 years agoBugfix - if index is given as -1, insert after last member rather than before. See...
Andy Allan [Tue, 29 Mar 2011 19:29:13 +0000 (20:29 +0100)]
Bugfix - if index is given as -1, insert after last member rather than before. See also AddNodeToWayAction

11 years agoBugfix - index can be -ve. Fixes problem with undo/redo leading to ever increasingly...
Andy Allan [Tue, 29 Mar 2011 19:28:09 +0000 (20:28 +0100)]
Bugfix - index can be -ve. Fixes problem with undo/redo leading to ever increasingly repeated relation membership

11 years agoDispatch a load complete event even on error, so that loading... labels are handled...
Andy Allan [Tue, 29 Mar 2011 15:20:16 +0000 (16:20 +0100)]
Dispatch a load complete event even on error, so that loading... labels are handled properly

11 years agoFix flex bug with dragEvent returning negative stageX/stageY. Fixes #3613
Andy Allan [Tue, 29 Mar 2011 13:49:12 +0000 (14:49 +0100)]
Fix flex bug with dragEvent returning negative stageX/stageY. Fixes #3613

11 years agoFix 'sticking tags' issue
Richard Fairhurst [Mon, 28 Mar 2011 06:24:55 +0000 (07:24 +0100)]
Fix 'sticking tags' issue

11 years agoFix bug where 'trailing' keypresses from a TextField might be passed through
Richard Fairhurst [Tue, 15 Mar 2011 14:22:58 +0000 (14:22 +0000)]
Fix bug where 'trailing' keypresses from a TextField might be passed through

11 years agoBugfix - starting way from existing node and clicking again caused dupe-node way
Andy Allan [Fri, 11 Mar 2011 12:59:55 +0000 (12:59 +0000)]
Bugfix - starting way from existing node and clicking again caused dupe-node way

Set the lastClick and lastClickTime even if it's not a standalone poi - the first so we can track dupe-node ways from existing nodes, the latter so that double-click testing doesn't blow up on null.

11 years agoUpdate .gitignore with more items from other build targets
Andy Allan [Wed, 9 Mar 2011 14:12:30 +0000 (14:12 +0000)]
Update .gitignore with more items from other build targets

11 years agoFix space-handling bugs - clear keys from EditController.keys during keyUp in all...
Andy Allan [Wed, 9 Mar 2011 14:08:04 +0000 (14:08 +0000)]
Fix space-handling bugs - clear keys from EditController.keys during keyUp in all cases, and also ignore inputs from textfields

11 years agoSign the upload URL
Tom Hughes [Wed, 9 Mar 2011 12:44:14 +0000 (12:44 +0000)]
Sign the upload URL

11 years agoIgnore generated files
Tom Hughes [Wed, 9 Mar 2011 11:10:42 +0000 (11:10 +0000)]
Ignore generated files

11 years agopermit GPS tracks to be cleared from the usual menu. Fixes #3492
Richard Fairhurst [Tue, 8 Mar 2011 14:09:46 +0000 (14:09 +0000)]
permit GPS tracks to be cleared from the usual menu. Fixes #3492

11 years agonot a great fan of mixed-type arrays but this will do for now...
Richard Fairhurst [Mon, 7 Mar 2011 13:27:52 +0000 (13:27 +0000)]
not a great fan of mixed-type arrays but this will do for now...

11 years agomove mouse-up listener to the stage, should fix #3410
Richard Fairhurst [Mon, 7 Mar 2011 13:23:09 +0000 (13:23 +0000)]
move mouse-up listener to the stage, should fix #3410

11 years agopurge tiles when they go off-screen. This basically removes the single biggest memory...
Richard Fairhurst [Sun, 6 Mar 2011 19:16:13 +0000 (19:16 +0000)]
purge tiles when they go off-screen. This basically removes the single biggest memory hog in P2

11 years agoreorder access values for consistency and add designation tag
Richard Fairhurst [Fri, 4 Mar 2011 15:37:08 +0000 (15:37 +0000)]
reorder access values for consistency and add designation tag

11 years agoFix #3558.
Richard Fairhurst [Thu, 3 Mar 2011 11:50:01 +0000 (11:50 +0000)]
Fix #3558.

11 years agoremove a few bits of long-dead commented-out code
Andy Allan [Fri, 25 Feb 2011 19:53:11 +0000 (19:53 +0000)]
remove a few bits of long-dead commented-out code

11 years agoRemove the keyboard event listener from the delete and add buttons - this is now...
Andy Allan [Thu, 24 Feb 2011 14:16:24 +0000 (14:16 +0000)]
Remove the keyboard event listener from the delete and add buttons - this is now done globally as per [25366]

11 years agomove "show lat/long" from a keypress to an option. Slightly keen that P2 should not...
Richard Fairhurst [Sat, 19 Feb 2011 14:29:46 +0000 (14:29 +0000)]
move "show lat/long" from a keypress to an option. Slightly keen that P2 should not have as much of a reputation as P1 for obscure keypresses :)

11 years agodocument + keypress
Richard Fairhurst [Sat, 19 Feb 2011 14:28:07 +0000 (14:28 +0000)]
document + keypress

11 years agorespond to keypresses even if the focus is on a Flex control outside the map
Richard Fairhurst [Sat, 19 Feb 2011 11:16:24 +0000 (11:16 +0000)]
respond to keypresses even if the focus is on a Flex control outside the map

11 years agoMove cycleway=segregated and cycleway=shared to highway=cycleway, rather than road...
Steve Bennett [Sat, 19 Feb 2011 01:19:18 +0000 (01:19 +0000)]
Move cycleway=segregated and cycleway=shared to highway=cycleway, rather than road types. Discussed on potlatch-dev on Feb 3.

11 years agoupdate slider as the video plays, and preserve playing state during slider drags
Richard Fairhurst [Fri, 18 Feb 2011 15:29:41 +0000 (15:29 +0000)]
update slider as the video plays, and preserve playing state during slider drags

11 years agoMake the undo/redo buttons in the main application file translateable
Andy Allan [Fri, 18 Feb 2011 14:30:38 +0000 (14:30 +0000)]
Make the undo/redo buttons in the main application file translateable

11 years agoAdd en_US locale
Andy Allan [Fri, 18 Feb 2011 14:30:34 +0000 (14:30 +0000)]
Add en_US locale

11 years agoAdd BabelFx translation library, with two example translations
Andy Allan [Fri, 18 Feb 2011 14:30:32 +0000 (14:30 +0000)]
Add BabelFx translation library, with two example translations

11 years agoAdd support for relations to match multiple tags. Turned out to be a bit more involve...
Steve Bennett [Fri, 18 Feb 2011 11:32:12 +0000 (11:32 +0000)]
Add support for relations to match multiple tags. Turned out to be a bit more involved than expected. The upshot of it all is that both route=hiking and route=foot walking routes are perfectly supported. By default, route=hiking are made, but existing tags aren't converted.

The syntax is slightly inconsistent:
    <tag k="route" v="hiking" vmatch="hiking|foot"/>
on the relation, but
      <match k="route" v="hiking|foot"/>
on the path. I don't think it's a major drama, and easily changed. Also, match/@v is not a regexp, it's just pipe-separated values.
Inspired by NopMap <ekkehart@gmx.de> on potlatch-dev, 14 Feb 2011.

11 years agoexplicitly remove listensprite
Richard Fairhurst [Fri, 18 Feb 2011 08:50:00 +0000 (08:50 +0000)]
explicitly remove listensprite

11 years agoembed tutorial video in help dialogue
Richard Fairhurst [Fri, 18 Feb 2011 08:49:05 +0000 (08:49 +0000)]
embed tutorial video in help dialogue

11 years agotutorial video
Richard Fairhurst [Fri, 18 Feb 2011 08:45:21 +0000 (08:45 +0000)]
tutorial video

11 years agoSwap round town and suburb, and fix suburb to use correct icon
Andy Allan [Wed, 16 Feb 2011 15:15:14 +0000 (15:15 +0000)]
Swap round town and suburb, and fix suburb to use correct icon

11 years agoDoesn't seem to happen any more -> remove from todo
Andy Allan [Wed, 16 Feb 2011 14:54:18 +0000 (14:54 +0000)]
Doesn't seem to happen any more -> remove from todo

11 years agoUse the new place icons from sjjb set
Andy Allan [Wed, 16 Feb 2011 14:54:17 +0000 (14:54 +0000)]
Use the new place icons from sjjb set

11 years agoremove a huge load of pseudo-traces
Richard Fairhurst [Wed, 16 Feb 2011 13:50:25 +0000 (13:50 +0000)]
remove a huge load of pseudo-traces

11 years agoA different way to (hopefully) fix the binding issue
Andy Allan [Wed, 16 Feb 2011 12:38:29 +0000 (12:38 +0000)]
A different way to (hopefully) fix the binding issue

11 years agoBack out last change, it causes more problems than it solves
Andy Allan [Wed, 16 Feb 2011 12:25:22 +0000 (12:25 +0000)]
Back out last change, it causes more problems than it solves

11 years agoFix(?) the binding warnings for Choice editor
Andy Allan [Tue, 15 Feb 2011 18:39:32 +0000 (18:39 +0000)]
Fix(?) the binding warnings for Choice editor

11 years agoEnsure consistent capitalisation of interface by hunting down rogue name=name feature...
Andy Allan [Tue, 15 Feb 2011 17:30:16 +0000 (17:30 +0000)]
Ensure consistent capitalisation of interface by hunting down rogue name=name feature inputs and converting them to simpleName inputSet references

11 years agopoint out forcibly to Flex that as I have closed the popup, I might like to be able...
Richard Fairhurst [Tue, 15 Feb 2011 17:26:34 +0000 (17:26 +0000)]
point out forcibly to Flex that as I have closed the popup, I might like to be able to click underneath where it was

11 years agoShinier oneway arrows
Andy Allan [Tue, 15 Feb 2011 17:12:55 +0000 (17:12 +0000)]
Shinier oneway arrows

11 years agoimprove CategorySelector performance by a magnitude of about 370 million
Richard Fairhurst [Tue, 15 Feb 2011 17:12:51 +0000 (17:12 +0000)]
improve CategorySelector performance by a magnitude of about 370 million

11 years agoImprove the rotation icons, so they are the union of their component shapes and don...
Andy Allan [Tue, 15 Feb 2011 17:02:47 +0000 (17:02 +0000)]
Improve the rotation icons, so they are the union of their component shapes and don't show the overlaps when 'disabled'. Also, de-inkscape-ify them

11 years agoremove floaty-warnings from the TODO
Andy Allan [Tue, 15 Feb 2011 17:02:45 +0000 (17:02 +0000)]
remove floaty-warnings from the TODO

11 years agoDon't load bugs that have the 'is default description' flag set.
Andy Allan [Tue, 15 Feb 2011 16:10:57 +0000 (16:10 +0000)]
Don't load bugs that have the 'is default description' flag set.

11 years agoImprove the mini roundabout icon, based on german road sign arrows
Andy Allan [Tue, 15 Feb 2011 15:14:39 +0000 (15:14 +0000)]
Improve the mini roundabout icon, based on german road sign arrows

11 years agoAdd some icon sources, uses the same format as the sjjb ones so use sjjb tools to...
Andy Allan [Tue, 15 Feb 2011 14:53:43 +0000 (14:53 +0000)]
Add some icon sources, uses the same format as the sjjb ones so use sjjb tools to recolour

11 years agoRecolour some amenity icons
Andy Allan [Tue, 15 Feb 2011 14:48:00 +0000 (14:48 +0000)]
Recolour some amenity icons

11 years agoReworked traffic calming icon
Andy Allan [Tue, 15 Feb 2011 14:37:34 +0000 (14:37 +0000)]
Reworked traffic calming icon

11 years agoRemoving the boundary=postal_code definition - this is being used in a very specific...
Andy Allan [Tue, 15 Feb 2011 14:37:32 +0000 (14:37 +0000)]
Removing the boundary=postal_code definition - this is being used in a very specific fashion (involving relations) in Germany and isn't suitable for standalone tagging

11 years agonew dam icon
Richard Fairhurst [Tue, 15 Feb 2011 13:44:12 +0000 (13:44 +0000)]
new dam icon

11 years agoReturn dam to the water category, with description and description of coastline
Andy Allan [Tue, 15 Feb 2011 12:25:16 +0000 (12:25 +0000)]
Return dam to the water category, with description and description of coastline

11 years agoShow the description of the feature when hovering over the feature in the CategorySel...
Andy Allan [Tue, 15 Feb 2011 12:25:15 +0000 (12:25 +0000)]
Show the description of the feature when hovering over the feature in the CategorySelector

11 years agoRemove drinking fountain from the water (-bourne-activities) category
Andy Allan [Tue, 15 Feb 2011 12:25:13 +0000 (12:25 +0000)]
Remove drinking fountain from the water (-bourne-activities) category

11 years agomake explicit
Richard Fairhurst [Tue, 15 Feb 2011 11:02:43 +0000 (11:02 +0000)]
make explicit

11 years agoRecolour slipway icon (created from new svg) and recombine separate slipway features
Andy Allan [Tue, 15 Feb 2011 10:53:52 +0000 (10:53 +0000)]
Recolour slipway icon (created from new svg) and recombine separate slipway features

11 years agoAdd dnd overrides for remaining unsuitable icons
Andy Allan [Mon, 14 Feb 2011 19:30:19 +0000 (19:30 +0000)]
Add dnd overrides for remaining unsuitable icons

11 years agoremove the dnd attribute from tower - oops, I didn't spot that - and it would be...
Andy Allan [Mon, 14 Feb 2011 19:30:17 +0000 (19:30 +0000)]
remove the dnd attribute from tower - oops, I didn't spot that - and it would be a property of the feature rather than the icon in any case

11 years agoAdd an (optional) dnd property to icon elements to override the standard image in...
Andy Allan [Mon, 14 Feb 2011 18:57:22 +0000 (18:57 +0000)]
Add an (optional) dnd property to icon elements to override the standard image in the dnd panel

11 years agoRecolour the pharmacy icon to match the rest of the category
Andy Allan [Mon, 14 Feb 2011 17:48:59 +0000 (17:48 +0000)]
Recolour the pharmacy icon to match the rest of the category

11 years agoCreate and use icons for toy shop and town hall
Andy Allan [Mon, 14 Feb 2011 17:43:30 +0000 (17:43 +0000)]
Create and use icons for toy shop and town hall

11 years agoInvent a sport_shooting icon, and use it for hunting stand
Andy Allan [Mon, 14 Feb 2011 17:15:08 +0000 (17:15 +0000)]
Invent a sport_shooting icon, and use it for hunting stand

11 years agoUse full-resolution version of place_of_worship_unknown
Andy Allan [Mon, 14 Feb 2011 15:03:26 +0000 (15:03 +0000)]
Use full-resolution version of place_of_worship_unknown

11 years agoconsistency with food and drink
Andy Allan [Mon, 14 Feb 2011 15:03:23 +0000 (15:03 +0000)]
consistency with food and drink

11 years agoRemove flowers icon (licensing and consistency) and update flowers and garden centre...
Andy Allan [Mon, 14 Feb 2011 14:46:22 +0000 (14:46 +0000)]
Remove flowers icon (licensing and consistency) and update flowers and garden centre from sjjb set

11 years agoRemove some sports areas from landuse category, and move marketplace from landuse...
Andy Allan [Mon, 14 Feb 2011 14:34:44 +0000 (14:34 +0000)]
Remove some sports areas from landuse category, and move marketplace from landuse to shopping

11 years agoFIX bug with LWN/RWN/NWN paths: route=hiking was not being set.
Steve Bennett [Mon, 14 Feb 2011 12:58:21 +0000 (12:58 +0000)]
FIX bug with LWN/RWN/NWN paths: route=hiking was not being set.
CHANGE route=foot to route=hiking on these relations. It's about twice as popular on taginfo.

11 years agoADD keyboard shortcuts , and . (< and >) to step node by node along a way. Maintain...
Steve Bennett [Sun, 13 Feb 2011 22:49:22 +0000 (22:49 +0000)]
ADD keyboard shortcuts , and . (< and >) to step node by node along a way. Maintain state of selected node in SelectedWayNode.as so that cycling ways works as expected.
REFACTOR scrollIfNeeded() to Map.as

11 years agoset explicit width in CategorySelector so the scrollbar doesn't screw things up
Richard Fairhurst [Sun, 13 Feb 2011 21:29:49 +0000 (21:29 +0000)]
set explicit width in CategorySelector so the scrollbar doesn't screw things up

11 years agoremove errors that seem to have been introduced in recent days
Richard Fairhurst [Sun, 13 Feb 2011 20:22:41 +0000 (20:22 +0000)]
remove errors that seem to have been introduced in recent days

11 years agomissing route=bicycle lines from NCN/RCN/LCN relations
Richard Fairhurst [Sun, 13 Feb 2011 20:03:38 +0000 (20:03 +0000)]
missing route=bicycle lines from NCN/RCN/LCN relations

11 years agoupdate .ai file
Richard Fairhurst [Sun, 13 Feb 2011 19:16:01 +0000 (19:16 +0000)]
update .ai file

11 years agomore icons. This should complete the way icon set for roads, paths, water and other...
Richard Fairhurst [Sun, 13 Feb 2011 19:14:51 +0000 (19:14 +0000)]
more icons. This should complete the way icon set for roads, paths, water and other transport. Anyone adding another preset within these categories without a beautiful perfectly matching icon will be taken outside and shot several times :)

11 years agoremove "racing track" from roads. svn appears to think the whole file has changed...
Richard Fairhurst [Sun, 13 Feb 2011 18:01:31 +0000 (18:01 +0000)]
remove "racing track" from roads. svn appears to think the whole file has changed, presumably a cr/lf issue

11 years agotidy route icons a little (very sorry to see the epic bus icon go, obviously)
Richard Fairhurst [Sun, 13 Feb 2011 17:53:10 +0000 (17:53 +0000)]
tidy route icons a little (very sorry to see the epic bus icon go, obviously)

11 years agoadd some icon guidelines
Richard Fairhurst [Sun, 13 Feb 2011 17:06:40 +0000 (17:06 +0000)]
add some icon guidelines

11 years agosort out a whole bunch of the horrible mess that is our icon set, including new railw...
Richard Fairhurst [Sun, 13 Feb 2011 17:02:38 +0000 (17:02 +0000)]
sort out a whole bunch of the horrible mess that is our icon set, including new railway/waterway 75x45 icons

11 years agoTWEAK highway=unclassified to distinguish it from highway=tertiary, as per http:...
Steve Bennett [Sun, 13 Feb 2011 13:45:10 +0000 (13:45 +0000)]
TWEAK highway=unclassified to distinguish it from highway=tertiary, as per trac.openstreetmap.org/ticket/3374

11 years agoADD power station icon
Steve Bennett [Sun, 13 Feb 2011 13:39:35 +0000 (13:39 +0000)]
ADD power station icon
TWEAK vending machine icon

11 years ago(SelectedMultiple.as should have been part of the last commit)
Steve Bennett [Sun, 13 Feb 2011 13:32:59 +0000 (13:32 +0000)]
(SelectedMultiple.as should have been part of the last commit)

11 years agoADD ability to merge one node with another (including POI nodes)
Steve Bennett [Sun, 13 Feb 2011 13:32:06 +0000 (13:32 +0000)]
ADD ability to merge one node with another (including POI nodes)
ADD warning when merged tags conflict (including from way-way mergers)

11 years agoCLEANUP leftover Trace statements.
Steve Bennett [Sat, 12 Feb 2011 17:18:23 +0000 (17:18 +0000)]
CLEANUP leftover Trace statements.

11 years agoFIX Circularise bug. There was an odd bug that caused the centroid to be calculated...
Steve Bennett [Sat, 12 Feb 2011 17:16:48 +0000 (17:16 +0000)]
FIX Circularise bug. There was an odd bug that caused the centroid to be calculated incorrectly, yielding oversized, misplaced circles. Inspired by openstreetmap.org/user/alexz/diary/13054, I replace the centroid calculation algorithm with a much simpler "average of X and Y". In my testing, it yields good results. It's technically "incorrect" for heavily skewed polygons, but IMHO there the result is still acceptable, and it's hardly what Circularise is designed for.

11 years agoADD icons for vending machine and mini roundabout.
Steve Bennett [Sat, 12 Feb 2011 09:14:53 +0000 (09:14 +0000)]
ADD icons for vending machine and mini roundabout.

11 years agoADD three new multi-type man_made features: navigation mark, tower, and silo. All...
Steve Bennett [Sat, 12 Feb 2011 07:21:25 +0000 (07:21 +0000)]
ADD three new multi-type man_made features: navigation mark, tower, and silo. All of them collect a number of other top-level tags. New icons added for them.

11 years agoADD support for non-drag-and-droppable point features. These are specified as <point...
Steve Bennett [Sat, 12 Feb 2011 05:53:24 +0000 (05:53 +0000)]
ADD support for non-drag-and-droppable point features. These are specified as <point draganddrop="no"/> (default is yes). Enable this for highway=turning_circle by way of example.

11 years agoIMPROVE help icon functionality - if no help URL is defined, take user to http:/...
Steve Bennett [Fri, 11 Feb 2011 12:09:23 +0000 (12:09 +0000)]
IMPROVE help icon functionality - if no help URL is defined, take user to openstreetmap.org/wiki/Tag:featuretag=featurevalue . Seems a bit pointless slavishly defining the wiki address for every single feature when it can be generated.