]> git.openstreetmap.org Git - potlatch2.git/log
potlatch2.git
11 years agoMerge remote-tracking branch 'gravitystorm/opendata-source'
Richard Fairhurst [Sun, 22 May 2011 14:51:19 +0000 (15:51 +0100)]
Merge remote-tracking branch 'gravitystorm/opendata-source'

11 years agoMerge remote-tracking branch 'gravitystorm/ruin'
Richard Fairhurst [Sun, 22 May 2011 14:51:02 +0000 (15:51 +0100)]
Merge remote-tracking branch 'gravitystorm/ruin'

11 years agoMerge remote-tracking branch 'gravitystorm/icons2'
Richard Fairhurst [Sun, 22 May 2011 14:46:46 +0000 (15:46 +0100)]
Merge remote-tracking branch 'gravitystorm/icons2'

11 years agoAdd underscores to OS OpenData source tags - see #3725
Andy Allan [Sun, 22 May 2011 13:55:24 +0000 (14:55 +0100)]
Add underscores to OS OpenData source tags - see #3725

11 years agoBump to version 2.1 2.1
Richard Fairhurst [Sat, 21 May 2011 16:02:55 +0000 (17:02 +0100)]
Bump to version 2.1

11 years agoMerge branch 'staging'
Richard Fairhurst [Sat, 21 May 2011 15:43:59 +0000 (16:43 +0100)]
Merge branch 'staging'

11 years agoRewording in Search dialogue
Richard Fairhurst [Sat, 21 May 2011 15:42:25 +0000 (16:42 +0100)]
Rewording in Search dialogue

11 years agoAdd NAIP imagery
Richard Fairhurst [Sat, 21 May 2011 07:31:48 +0000 (08:31 +0100)]
Add NAIP imagery

11 years agoDon't initialise Yahoo component until it's actually wanted. Should stop P2 from...
Richard Fairhurst [Sat, 7 May 2011 19:04:48 +0000 (20:04 +0100)]
Don't initialise Yahoo component until it's actually wanted. Should stop P2 from loading a bunch of Yahoo tiles (and clogging up my error log)

11 years agoMove Yahoo into imagery.xml rather than hard-coding it into the menu
Richard Fairhurst [Sat, 7 May 2011 18:18:18 +0000 (19:18 +0100)]
Move Yahoo into imagery.xml rather than hard-coding it into the menu

11 years agoAdd "Delete relation" option
Richard Fairhurst [Sat, 7 May 2011 18:08:40 +0000 (19:08 +0100)]
Add "Delete relation" option

11 years agoMerge branch 'drawquad' into staging
Richard Fairhurst [Sat, 7 May 2011 17:11:27 +0000 (18:11 +0100)]
Merge branch 'drawquad' into staging

11 years agoMerge branch 'loadrelation' into staging
Richard Fairhurst [Sat, 7 May 2011 17:07:03 +0000 (18:07 +0100)]
Merge branch 'loadrelation' into staging

11 years agoremove some more MQ-specific stuff
Richard Fairhurst [Sat, 7 May 2011 13:33:51 +0000 (14:33 +0100)]
remove some more MQ-specific stuff

11 years agoremove some MQ files
Richard Fairhurst [Sat, 7 May 2011 13:30:28 +0000 (14:30 +0100)]
remove some MQ files

11 years agoIntegrating search functionality from AntTheLimey
Richard Fairhurst [Sat, 7 May 2011 13:21:30 +0000 (14:21 +0100)]
Integrating search functionality from AntTheLimey

11 years agoMerged pull request #2 from tomhughes/master.
systemed [Thu, 28 Apr 2011 19:45:58 +0000 (12:45 -0700)]
Merged pull request #2 from tomhughes/master.

Support XML errors when fetching map data

11 years agoRequest, and handle, errors in XML format when loading map data
Tom Hughes [Thu, 28 Apr 2011 14:00:38 +0000 (15:00 +0100)]
Request, and handle, errors in XML format when loading map data

11 years agofinishing find function
Antony Pegg [Tue, 26 Apr 2011 19:55:59 +0000 (15:55 -0400)]
finishing find function

11 years agoFixed ruin preset as per bug #3719
Serge Wroclawski [Mon, 25 Apr 2011 15:27:47 +0000 (11:27 -0400)]
Fixed ruin preset as per bug #3719

11 years agomerging mapquest to addNominatim
Antony Pegg [Thu, 21 Apr 2011 12:35:43 +0000 (08:35 -0400)]
merging mapquest to addNominatim

11 years agoadding nominatim to P2
Antony Pegg [Thu, 21 Apr 2011 12:24:25 +0000 (08:24 -0400)]
adding nominatim to P2

11 years agomaking try access button get autopressed on oAuth return, and upgrading potlatch2...
Antony Pegg [Mon, 18 Apr 2011 20:00:19 +0000 (16:00 -0400)]
making try access button get autopressed on oAuth return, and upgrading potlatch2,html to use swfobject 2.2 so it works in IE

11 years agoMerge branch 'master' into mapquest
Antony Pegg [Mon, 18 Apr 2011 15:38:01 +0000 (11:38 -0400)]
Merge branch 'master' into mapquest

11 years agomaking oAuth open up in a smaller centred window
Antony Pegg [Mon, 18 Apr 2011 15:29:49 +0000 (11:29 -0400)]
making oAuth open up in a smaller centred window

11 years agoSend X-Error-Format workaround on OAuth PUT too
Richard Fairhurst [Mon, 18 Apr 2011 11:36:39 +0000 (12:36 +0100)]
Send X-Error-Format workaround on OAuth PUT too

11 years agoMove to c.tile.osm.org as per request by Firefishy
Richard Fairhurst [Mon, 18 Apr 2011 11:34:32 +0000 (12:34 +0100)]
Move to c.tile.osm.org as per request by Firefishy

11 years agoConstruct array properly
Richard Fairhurst [Mon, 18 Apr 2011 11:34:05 +0000 (12:34 +0100)]
Construct array properly

11 years agoMerge branch 'master' into mapquest
Antony Pegg [Thu, 14 Apr 2011 11:51:10 +0000 (07:51 -0400)]
Merge branch 'master' into mapquest

11 years agoFix the OS 1:25k background to use jpg, not png
Andy Allan [Tue, 12 Apr 2011 14:10:09 +0000 (15:10 +0100)]
Fix the OS 1:25k background to use jpg, not png

11 years agoMerge branch 'master' into mapquest
Antony Pegg [Tue, 12 Apr 2011 13:28:03 +0000 (09:28 -0400)]
Merge branch 'master' into mapquest

11 years agoMerge branch 'master' into mapquest
Antony Pegg [Tue, 12 Apr 2011 12:47:42 +0000 (08:47 -0400)]
Merge branch 'master' into mapquest

Conflicts:
net/systemeD/potlatch2/Toolbox.mxml
version.as.template

11 years agoThrow a floating alert when quadrilateralise blows up
Richard Fairhurst [Fri, 8 Apr 2011 17:41:29 +0000 (18:41 +0100)]
Throw a floating alert when quadrilateralise blows up

11 years agoAdd 'clear' to i18n
Richard Fairhurst [Fri, 8 Apr 2011 14:56:09 +0000 (15:56 +0100)]
Add 'clear' to i18n

11 years agoMerge branch 'master' of https://github.com/systemed/potlatch2
Richard Fairhurst [Fri, 8 Apr 2011 14:42:17 +0000 (15:42 +0100)]
Merge branch 'master' of https://github.com/systemed/potlatch2

11 years agoDon't let nodes occur twice successively in ways
Richard Fairhurst [Fri, 8 Apr 2011 14:41:11 +0000 (15:41 +0100)]
Don't let nodes occur twice successively in ways

11 years agoFix temporary duplicate key issue
Richard Fairhurst [Wed, 6 Apr 2011 15:53:26 +0000 (16:53 +0100)]
Fix temporary duplicate key issue

11 years agoMerge branch 'master' of https://github.com/systemed/potlatch2 into drawquad
Richard Fairhurst [Tue, 5 Apr 2011 14:18:31 +0000 (15:18 +0100)]
Merge branch 'master' of https://github.com/systemed/potlatch2 into drawquad

11 years agoFix tag repeat bug
Richard Fairhurst [Tue, 5 Apr 2011 09:06:04 +0000 (10:06 +0100)]
Fix tag repeat bug

11 years agoMerge remote branch 'gravitystorm/nulltags'
Richard Fairhurst [Mon, 4 Apr 2011 11:26:25 +0000 (12:26 +0100)]
Merge remote branch 'gravitystorm/nulltags'

11 years agoFix issue with adding new tags in advanced view
Richard Fairhurst [Mon, 4 Apr 2011 10:18:12 +0000 (11:18 +0100)]
Fix issue with adding new tags in advanced view

11 years agoBugfix: tag values can be null (e.g. changing feature type), so guard against that...
Andy Allan [Sun, 3 Apr 2011 14:43:31 +0000 (15:43 +0100)]
Bugfix: tag values can be null (e.g. changing feature type), so guard against that when length limiting.

11 years agoAdd unit tests to expose problem with setting null strings in tags
Andy Allan [Sun, 3 Apr 2011 14:38:28 +0000 (15:38 +0100)]
Add unit tests to expose problem with setting null strings in tags

11 years agoMatch map features icon and halcyon icon for Garden Centre
Grant Slater [Sun, 3 Apr 2011 12:58:11 +0000 (13:58 +0100)]
Match map features icon and halcyon icon for Garden Centre

11 years agoMerge branch 'master' into icons2
Andy Allan [Sun, 3 Apr 2011 13:39:09 +0000 (14:39 +0100)]
Merge branch 'master' into icons2

11 years agoVersion 2.0 2.0
Richard Fairhurst [Sun, 3 Apr 2011 12:58:18 +0000 (13:58 +0100)]
Version 2.0

11 years agoDon't let empty comments through
Richard Fairhurst [Sun, 3 Apr 2011 12:54:48 +0000 (13:54 +0100)]
Don't let empty comments through

11 years agoPrevent keys/values exceeding 255 characters
Richard Fairhurst [Sun, 3 Apr 2011 12:47:13 +0000 (13:47 +0100)]
Prevent keys/values exceeding 255 characters

11 years agoUse the new stadium icon, and remove the tourist_blank icon
Andy Allan [Sun, 3 Apr 2011 11:35:02 +0000 (12:35 +0100)]
Use the new stadium icon, and remove the tourist_blank icon

11 years agoRemove unused blank icons
Andy Allan [Sun, 3 Apr 2011 10:58:52 +0000 (11:58 +0100)]
Remove unused blank icons

11 years agoCreate a car wash icon and use that for both the map_features and potlatch stylesheet
Andy Allan [Sun, 3 Apr 2011 10:41:16 +0000 (11:41 +0100)]
Create a car wash icon and use that for both the map_features and potlatch stylesheet

11 years agoGeneral building now also poi (and not only area)
Henk Hoff [Sat, 2 Apr 2011 16:59:12 +0000 (17:59 +0100)]
General building now also poi (and not only area)

11 years agoCar_wash added
Henk Hoff [Sat, 2 Apr 2011 16:59:26 +0000 (17:59 +0100)]
Car_wash added

11 years agoComplete support for loading relations by ID
Richard Fairhurst [Sat, 2 Apr 2011 21:35:13 +0000 (22:35 +0100)]
Complete support for loading relations by ID

11 years agoLoad relations from the server on supplying the ID
Richard Fairhurst [Sat, 2 Apr 2011 18:14:20 +0000 (19:14 +0100)]
Load relations from the server on supplying the ID

11 years agoCorrectly redraw junction nodes when removed from a way
Richard Fairhurst [Sat, 2 Apr 2011 17:28:44 +0000 (18:28 +0100)]
Correctly redraw junction nodes when removed from a way

11 years agoMerge remote-tracking branch 'gravitystorm/redo' into staging
Richard Fairhurst [Sat, 2 Apr 2011 16:51:15 +0000 (17:51 +0100)]
Merge remote-tracking branch 'gravitystorm/redo' into staging

11 years agoMerge remote-tracking branch 'gravitystorm/i18n' into staging
Richard Fairhurst [Sat, 2 Apr 2011 16:48:47 +0000 (17:48 +0100)]
Merge remote-tracking branch 'gravitystorm/i18n' into staging

11 years agoMerge remote-tracking branch 'gravitystorm/icons' into staging
Richard Fairhurst [Sat, 2 Apr 2011 16:45:03 +0000 (17:45 +0100)]
Merge remote-tracking branch 'gravitystorm/icons' into staging

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 agoPOI-to-quadrilateral drawing mode
Richard Fairhurst [Sat, 2 Apr 2011 16:40:07 +0000 (17:40 +0100)]
POI-to-quadrilateral drawing mode

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 agoPort MapQuest changes from previous repository to the new one
Andy Allan [Mon, 21 Mar 2011 13:25:37 +0000 (13:25 +0000)]
Port MapQuest changes from previous repository to the new one

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 agoUse sports stadium icon
Andy Allan [Fri, 11 Mar 2011 15:23:00 +0000 (15:23 +0000)]
Use sports stadium icon

11 years agoRemove unused icons
Andy Allan [Fri, 11 Mar 2011 15:22:45 +0000 (15:22 +0000)]
Remove unused icons

11 years agoshopping kiosk
Andy Allan [Fri, 11 Mar 2011 14:56:47 +0000 (14:56 +0000)]
shopping kiosk

11 years agoToys icon instead of rehashed nursery icon
Andy Allan [Fri, 11 Mar 2011 14:49:06 +0000 (14:49 +0000)]
Toys icon instead of rehashed nursery icon

11 years agoVending machine icon update
Andy Allan [Fri, 11 Mar 2011 14:47:03 +0000 (14:47 +0000)]
Vending machine icon update

11 years agoMarketplace icon
Andy Allan [Fri, 11 Mar 2011 14:41:02 +0000 (14:41 +0000)]
Marketplace icon

11 years agoUpdate transport icons (slipway, mini roundabout, speedbump) with new ones from sjjb
Andy Allan [Fri, 11 Mar 2011 14:37:54 +0000 (14:37 +0000)]
Update transport icons (slipway, mini roundabout, speedbump) with new ones from sjjb

11 years agoUse new power icons from sjjb
Andy Allan [Fri, 11 Mar 2011 14:21:16 +0000 (14:21 +0000)]
Use new power icons from sjjb

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 shooting icon to new one from sjjb
Andy Allan [Thu, 10 Mar 2011 18:20:03 +0000 (18:20 +0000)]
Update shooting icon to new one from sjjb

11 years agoMore Polish translation, by RafalR
Andy Allan [Wed, 9 Mar 2011 14:41:32 +0000 (14:41 +0000)]
More Polish translation, by RafalR

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 agoAdd Polish translation.
Andrzej Zaborowski [Wed, 9 Mar 2011 08:52:10 +0000 (09:52 +0100)]
Add Polish translation.

11 years agoAdd German tranlation, thanks to Claudius H. via trac #3565
Andy Allan [Tue, 8 Mar 2011 19:08:03 +0000 (19:08 +0000)]
Add German tranlation, thanks to Claudius H. via trac #3565

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