potlatch2.git
10 years agoMerge branch 'master' into snapshotserver
Richard Fairhurst [Sat, 8 Oct 2011 08:43:39 +0000 (09:43 +0100)]
Merge branch 'master' into snapshotserver

10 years agoMerge pull request #19 from Firefishy/master
Richard Fairhurst [Thu, 6 Oct 2011 10:15:27 +0000 (03:15 -0700)]
Merge pull request #19 from Firefishy/master

Require Flash 10.1.85 and add missing swfobject file.

10 years agoSet Flash Player 10.1.85 as minimum supported version. Add missing swfobject file...
Grant Slater [Wed, 5 Oct 2011 16:48:23 +0000 (17:48 +0100)]
Set Flash Player 10.1.85 as minimum supported version. Add missing swfobject file expressInstall.swf

10 years agoMerge https://github.com/systemed/potlatch2
Grant Slater [Wed, 5 Oct 2011 16:39:01 +0000 (17:39 +0100)]
Merge https://github.com/systemed/potlatch2

10 years agoSupport importing the <create> element only of <osmChange> files
Richard Fairhurst [Mon, 3 Oct 2011 16:22:22 +0000 (17:22 +0100)]
Support importing the <create> element only of <osmChange> files

10 years agoTidy and fix the pull-through code
Richard Fairhurst [Mon, 3 Oct 2011 15:37:40 +0000 (16:37 +0100)]
Tidy and fix the pull-through code

10 years agoUse eval-based width for licence colouring
Richard Fairhurst [Mon, 3 Oct 2011 13:47:41 +0000 (14:47 +0100)]
Use eval-based width for licence colouring

10 years agoDon't allow parallelise keypress to return 0-length ways
Richard Fairhurst [Mon, 3 Oct 2011 13:34:31 +0000 (14:34 +0100)]
Don't allow parallelise keypress to return 0-length ways

10 years agoShow tagged and untagged POI nodes differently
Richard Fairhurst [Mon, 3 Oct 2011 13:23:03 +0000 (14:23 +0100)]
Show tagged and untagged POI nodes differently

10 years agoRestrict imported tag values to 255 characters
Richard Fairhurst [Mon, 3 Oct 2011 13:09:41 +0000 (14:09 +0100)]
Restrict imported tag values to 255 characters

10 years agoRestrict changeset comments to 255 characters
Richard Fairhurst [Mon, 3 Oct 2011 13:01:17 +0000 (14:01 +0100)]
Restrict changeset comments to 255 characters

10 years agoFix long-running TagGrid annoyances
Richard Fairhurst [Mon, 3 Oct 2011 12:35:23 +0000 (13:35 +0100)]
Fix long-running TagGrid annoyances

10 years agoFix cascading on array-based declarations
Richard Fairhurst [Mon, 3 Oct 2011 11:43:41 +0000 (12:43 +0100)]
Fix cascading on array-based declarations

10 years agoUse subpart for highway=footway,bicycle=yes
Richard Fairhurst [Mon, 3 Oct 2011 11:43:19 +0000 (12:43 +0100)]
Use subpart for highway=footway,bicycle=yes

10 years agovalidateNow() - the magic Flex method that fixes everything
Richard Fairhurst [Mon, 3 Oct 2011 11:09:46 +0000 (12:09 +0100)]
validateNow() - the magic Flex method that fixes everything

10 years agoDon't break when selecting relations with unloaded members
Richard Fairhurst [Mon, 3 Oct 2011 10:43:12 +0000 (11:43 +0100)]
Don't break when selecting relations with unloaded members

10 years agoFix missing autocomplete bug, caused by some utterly bogus Flex 4 behaviour.
Richard Fairhurst [Sun, 2 Oct 2011 23:56:40 +0000 (00:56 +0100)]
Fix missing autocomplete bug, caused by some utterly bogus Flex 4 behaviour.
Fuck you, Adobe.

10 years agoFix indentation
Richard Fairhurst [Sun, 2 Oct 2011 23:56:30 +0000 (00:56 +0100)]
Fix indentation

10 years agoStill use (x) for removing from relations
Richard Fairhurst [Sun, 2 Oct 2011 12:59:52 +0000 (13:59 +0100)]
Still use (x) for removing from relations
(because it's more of a "remove" than "delete" operation)

10 years agoGive "create multipolygon" a toolbox icon
Richard Fairhurst [Sun, 2 Oct 2011 12:41:23 +0000 (13:41 +0100)]
Give "create multipolygon" a toolbox icon

10 years agoDelete icon now looks like WARNING DANGER DEATH rather than "stop that"
Richard Fairhurst [Sun, 2 Oct 2011 12:39:44 +0000 (13:39 +0100)]
Delete icon now looks like WARNING DANGER DEATH rather than "stop that"

10 years agoExperimental "create multipolygon" feature.
Richard Fairhurst [Sat, 1 Oct 2011 10:53:35 +0000 (11:53 +0100)]
Experimental "create multipolygon" feature.
For now, you need to (multiple) select the ways and press 'K'. (The intention is to expose it via the Toolbox UI: when 2+ enclosed areas are selected, the "join" icon will change to a "multipolygon" icon.)

10 years agoUse VectorCollection class for data binding on Vectors.
Richard Fairhurst [Sat, 1 Oct 2011 07:46:14 +0000 (08:46 +0100)]
Use VectorCollection class for data binding on Vectors.
Fixes issue with 'My tracks' display not working.

10 years agoDon't commit tag changes without suitable icons :)
Richard Fairhurst [Sat, 1 Oct 2011 07:21:14 +0000 (08:21 +0100)]
Don't commit tag changes without suitable icons :)

10 years agoMerge pull request #18 from tomhughes/master
Richard Fairhurst [Sat, 1 Oct 2011 07:19:01 +0000 (00:19 -0700)]
Merge pull request #18 from tomhughes/master

Update flexTasks.jar

10 years agoMerge branch 'master' of https://github.com/systemed/potlatch2
Richard Fairhurst [Fri, 30 Sep 2011 22:34:14 +0000 (23:34 +0100)]
Merge branch 'master' of https://github.com/systemed/potlatch2

10 years agoinputset -> inputSet
Richard Fairhurst [Fri, 30 Sep 2011 22:31:14 +0000 (23:31 +0100)]
inputset -> inputSet

10 years agoWrong category
Richard Fairhurst [Fri, 30 Sep 2011 22:30:10 +0000 (23:30 +0100)]
Wrong category

10 years agoMerge pull request #16 from gravitystorm/documentation
Richard Fairhurst [Fri, 30 Sep 2011 20:44:16 +0000 (13:44 -0700)]
Merge pull request #16 from gravitystorm/documentation

Documentation

10 years agoUpdate flexTasks.jar for flex 4.5.1
Tom Hughes [Fri, 30 Sep 2011 18:31:08 +0000 (19:31 +0100)]
Update flexTasks.jar for flex 4.5.1

10 years agoMerge branch 'master' into snapshotserver
Andy Allan [Fri, 30 Sep 2011 18:04:47 +0000 (19:04 +0100)]
Merge branch 'master' into snapshotserver

Conflicts:
net/systemeD/potlatch2/panels/BackgroundPanel.mxml

10 years agoFix compiler problem with ambiguous VideoEvent
Richard Fairhurst [Fri, 30 Sep 2011 17:13:28 +0000 (18:13 +0100)]
Fix compiler problem with ambiguous VideoEvent

10 years agoVersion 2.3 2.3
Richard Fairhurst [Fri, 30 Sep 2011 16:48:08 +0000 (17:48 +0100)]
Version 2.3

10 years agoMerge remote-tracking branch 'richardf/flex4' into flex4
Andy Allan [Fri, 30 Sep 2011 16:35:35 +0000 (17:35 +0100)]
Merge remote-tracking branch 'richardf/flex4' into flex4

Conflicts:
resources/imagery.xml

10 years agoAdd missing tag - mistake while reconciling conflicts
Andy Allan [Fri, 30 Sep 2011 16:29:48 +0000 (17:29 +0100)]
Add missing tag - mistake while reconciling conflicts

10 years agoSupport mountain bike routes
Richard Fairhurst [Fri, 30 Sep 2011 16:28:28 +0000 (17:28 +0100)]
Support mountain bike routes

10 years agodos2unix everything again
Andy Allan [Fri, 30 Sep 2011 16:18:42 +0000 (17:18 +0100)]
dos2unix everything again

10 years agoMerge branch 'master' into flex4
Andy Allan [Fri, 30 Sep 2011 16:14:23 +0000 (17:14 +0100)]
Merge branch 'master' into flex4

Conflicts:
net/systemeD/halcyon/connection/Connection.as
net/systemeD/potlatch2/find/FindDialog.mxml
potlatch2.mxml
resources/map_features/amenities.xml
resources/map_features/barriers.xml
resources/map_features/landuse.xml
resources/map_features/paths.xml
resources/map_features/transport.xml

10 years agoAdd Kosmosnimki imagery
Richard Fairhurst [Fri, 30 Sep 2011 15:55:48 +0000 (16:55 +0100)]
Add Kosmosnimki imagery

10 years agoAdd geoimage.at background layer
Richard Fairhurst [Fri, 30 Sep 2011 15:32:35 +0000 (16:32 +0100)]
Add geoimage.at background layer

10 years agoAdd more shortcuts to help dialogue
Richard Fairhurst [Fri, 30 Sep 2011 15:06:16 +0000 (16:06 +0100)]
Add more shortcuts to help dialogue

10 years agoMerge branch 'master' into snapshotserver
Andy Allan [Fri, 30 Sep 2011 15:04:57 +0000 (16:04 +0100)]
Merge branch 'master' into snapshotserver

10 years agoAdd an example of a snapshot layer
Andy Allan [Fri, 30 Sep 2011 15:00:26 +0000 (16:00 +0100)]
Add an example of a snapshot layer

10 years agoConvert celebrations into proper text
Andy Allan [Fri, 30 Sep 2011 14:59:34 +0000 (15:59 +0100)]
Convert celebrations into proper text

10 years agodon't highlight nodes if they haven't got any tags
Andy Allan [Fri, 30 Sep 2011 14:58:35 +0000 (15:58 +0100)]
don't highlight nodes if they haven't got any tags

10 years agoAllow more than one imagery source to have a logo
Richard Fairhurst [Fri, 30 Sep 2011 14:55:06 +0000 (15:55 +0100)]
Allow more than one imagery source to have a logo

10 years agoSlightly more useful warning messages
Andy Allan [Fri, 30 Sep 2011 11:01:32 +0000 (12:01 +0100)]
Slightly more useful warning messages

10 years agoEnforce consistent order on tabs
Richard Fairhurst [Thu, 29 Sep 2011 16:37:10 +0000 (17:37 +0100)]
Enforce consistent order on tabs

10 years agoMerge branch 'master' of https://github.com/systemed/potlatch2
Richard Fairhurst [Thu, 29 Sep 2011 08:41:09 +0000 (09:41 +0100)]
Merge branch 'master' of https://github.com/systemed/potlatch2

10 years agoUse name().localName to get the name of the root element, as elsewhere
Richard Fairhurst [Thu, 29 Sep 2011 08:40:31 +0000 (09:40 +0100)]
Use name().localName to get the name of the root element, as elsewhere

10 years agoMerge pull request #15 from Firefishy/patch-1
Richard Fairhurst [Tue, 20 Sep 2011 14:49:36 +0000 (07:49 -0700)]
Merge pull request #15 from Firefishy/patch-1

Fix incorrect image file path in landuse.xml

10 years agoMerge https://github.com/openstreetmap/potlatch2
Grant Slater [Tue, 20 Sep 2011 14:48:33 +0000 (14:48 +0000)]
Merge https://github.com/openstreetmap/potlatch2

10 years agoFix incorrect file path.
Grant [Tue, 20 Sep 2011 14:35:26 +0000 (16:35 +0200)]
Fix incorrect file path.

10 years agoAdd subcategories for map features.
Richard Fairhurst [Fri, 16 Sep 2011 10:36:21 +0000 (11:36 +0100)]
Add subcategories for map features.
Permits lesser-used settings (e.g. cutting/embankment) to be grouped under disclosure triangles.
This is pretty much the second part of the work to remove the clutter of having too many tabs.
Still needs some styling work!

10 years agoRemove confusing documentation and add pointer to web docs.
Richard Fairhurst [Fri, 16 Sep 2011 08:04:33 +0000 (09:04 +0100)]
Remove confusing documentation and add pointer to web docs.

10 years agoFix HTML rendering in drop-downs
Richard Fairhurst [Thu, 15 Sep 2011 19:53:13 +0000 (20:53 +0100)]
Fix HTML rendering in drop-downs

10 years agoUse workaround to force _factory to be non-null.
Richard Fairhurst [Thu, 15 Sep 2011 19:18:38 +0000 (20:18 +0100)]
Use workaround to force _factory to be non-null.
Fixes "empty dropdown" issue.

10 years agoWriting loops without braces is a capital offence
Andy Allan [Thu, 15 Sep 2011 16:29:45 +0000 (17:29 +0100)]
Writing loops without braces is a capital offence

10 years agoThat's some messed up stuff right there
Andy Allan [Thu, 15 Sep 2011 16:22:59 +0000 (17:22 +0100)]
That's some messed up stuff right there

10 years agoUse the DropDownList spark control for the choice editors
Andy Allan [Thu, 15 Sep 2011 16:22:33 +0000 (17:22 +0100)]
Use the DropDownList spark control for the choice editors

10 years agoRotate the arrow icon smoothly
Richard Fairhurst [Tue, 13 Sep 2011 14:51:53 +0000 (15:51 +0100)]
Rotate the arrow icon smoothly

10 years agoUpdate Arrow.fxg to match arrow.svg
Andy Allan [Tue, 13 Sep 2011 14:31:12 +0000 (15:31 +0100)]
Update Arrow.fxg to match arrow.svg

AKA Go-go-gadget-inkscape-fxg-export-plugin

10 years agoMove all the other buttons to spark components, and resize the reverse ones to fit
Andy Allan [Tue, 13 Sep 2011 14:00:36 +0000 (15:00 +0100)]
Move all the other buttons to spark components, and resize the reverse ones to fit

10 years agoMake rotation arrow Flex 4-compatible.
Richard Fairhurst [Mon, 12 Sep 2011 16:37:08 +0000 (17:37 +0100)]
Make rotation arrow Flex 4-compatible.
Good news: the code is very very simple!
The bad news: the rotated arrow looks like shit, and there's still a border around the button. Fixing this is left as an exercise for the read^H^H^H^Hdeveloper, but I suspect the easiest way will be to Sparkify the whole of Toolbox.mxml (we're going to do it some day anyway...).

10 years agoRearrange buttons so all the options are grouped on the right, and Help is next to...
Richard Fairhurst [Mon, 12 Sep 2011 13:34:52 +0000 (14:34 +0100)]
Rearrange buttons so all the options are grouped on the right, and Help is next to Save

10 years agoMerge pull request #13 from SteveC/master
Richard Fairhurst [Mon, 12 Sep 2011 13:10:07 +0000 (06:10 -0700)]
Merge pull request #13 from SteveC/master

Move the save button to the left

10 years agomove the save button to the left where new users expect it to be
SteveC [Wed, 7 Sep 2011 22:08:50 +0000 (15:08 -0700)]
move the save button to the left where new users expect it to be

10 years agoPointer to a StackOverflow question documenting "load this before anything else happens"
Richard Fairhurst [Sat, 3 Sep 2011 17:24:53 +0000 (18:24 +0100)]
Pointer to a StackOverflow question documenting "load this before anything else happens"

10 years agoAdd the ability to group image assets into a .zip file, removing the number of indivi...
Richard Fairhurst [Sat, 3 Sep 2011 17:19:52 +0000 (18:19 +0100)]
Add the ability to group image assets into a .zip file, removing the number of individual file requests.
To use, supply a Flash parameter with the location of the zips and the place they're "substituting" for, like this:
args["assets"] = "assets/icons.zip=icons/;assets/features_pois.zip=features/pois/";
Current limitations:
- Preloader indication is not smooth. (There was a trac ticket for this anyway :) )
- Only features and MapCSS icons are loaded - other image references don't yet look in ImageBank
- Nested folders in the .zip file are not supported (a limitation of the library we're using)

10 years agoSlight tidy
Richard Fairhurst [Sat, 3 Sep 2011 17:19:06 +0000 (18:19 +0100)]
Slight tidy

10 years agoReplace SuperTabNavigator (not compatible with Flex 4) with standard TabNavigator...
Richard Fairhurst [Fri, 2 Sep 2011 17:37:15 +0000 (18:37 +0100)]
Replace SuperTabNavigator (not compatible with Flex 4) with standard TabNavigator, but with icons!
Add ImageBank singleton to manage images. In due course we'll move Flex images in here too.

10 years agoFix compiler warnings
Richard Fairhurst [Fri, 26 Aug 2011 16:44:10 +0000 (17:44 +0100)]
Fix compiler warnings

10 years agoMerge pull request #11 from jetthe/mf01
systemed [Mon, 18 Jul 2011 16:23:30 +0000 (09:23 -0700)]
Merge pull request #11 from jetthe/mf01

A couple of minor bugfixes in map features

10 years agoOnly allow the user to drag items if they've been selected first
Richard Fairhurst [Mon, 18 Jul 2011 16:22:12 +0000 (17:22 +0100)]
Only allow the user to drag items if they've been selected first

10 years agotagSet->inputSet for toll booth fees.
Jonas Tull [Sat, 16 Jul 2011 12:36:51 +0000 (14:36 +0200)]
tagSet->inputSet for toll booth fees.

10 years agoinputset->inputSet. Now tram, subway and light rail lines can have embankments and...
Jonas Tull [Sat, 16 Jul 2011 12:04:25 +0000 (14:04 +0200)]
inputset->inputSet. Now tram, subway and light rail lines can have embankments and cuttings.

10 years agoinputset->inputSet. Post offices want name tags too!
Jonas Tull [Sat, 16 Jul 2011 11:57:47 +0000 (13:57 +0200)]
inputset->inputSet. Post offices want name tags too!

10 years agoRemoved ref to non-existent inputSet from paths. Did not add the inputSet "names...
Jonas Tull [Sat, 16 Jul 2011 11:55:58 +0000 (13:55 +0200)]
Removed ref to non-existent inputSet from paths. Did not add the inputSet "names" as there seems to be little usage of int_name/old_name/alt_name on paths.

10 years agoAreas can also have amenity=recycling.
Jonas Tull [Sat, 16 Jul 2011 09:33:10 +0000 (11:33 +0200)]
Areas can also have amenity=recycling.

10 years agoMove Fugro tileset to tile.osm.dk
Richard Fairhurst [Thu, 14 Jul 2011 16:22:57 +0000 (17:22 +0100)]
Move Fugro tileset to tile.osm.dk

10 years agoYou too can have your village in P2's background menu!
Richard Fairhurst [Thu, 14 Jul 2011 16:20:39 +0000 (17:20 +0100)]
You too can have your village in P2's background menu!

10 years agoTidy whitelisting /!\ patch
Richard Fairhurst [Thu, 14 Jul 2011 16:08:45 +0000 (17:08 +0100)]
Tidy whitelisting /!\ patch

10 years agoMerge pull request #10 from jetthe/3864
systemed [Thu, 14 Jul 2011 16:05:09 +0000 (09:05 -0700)]
Merge pull request #10 from jetthe/3864

Added whiteliste to DataGridWarningField. Fixes #3864.

10 years agoMerge pull request #7 from jetthe/3791
systemed [Thu, 14 Jul 2011 16:04:54 +0000 (09:04 -0700)]
Merge pull request #7 from jetthe/3791

Added recycling scheme and recycling_type for amenity=recycling. Fixes #3

10 years agoMerge pull request #9 from jetthe/3793
systemed [Thu, 14 Jul 2011 16:04:10 +0000 (09:04 -0700)]
Merge pull request #9 from jetthe/3793

Added contact_line and rail to key:electrified. Fixes #3793.

10 years agoMerge pull request #8 from jetthe/3792
systemed [Thu, 14 Jul 2011 16:03:42 +0000 (09:03 -0700)]
Merge pull request #8 from jetthe/3792

Added shelter_type to amenity=shelter. Fixes #3792.

10 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.

10 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

10 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

10 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/

10 years agoAdded shelter_type to amenity=shelter. Fixes #3792.
Jonas Tull [Thu, 14 Jul 2011 14:14:16 +0000 (16:14 +0200)]
Added shelter_type to amenity=shelter. Fixes #3792.

10 years agoAdded whiteliste to DataGridWarningField. Fixes #3864.
Jonas Tull [Thu, 14 Jul 2011 14:21:01 +0000 (16:21 +0200)]
Added whiteliste to DataGridWarningField. Fixes #3864.

10 years agoAdded contact_line and rail to key:electrified. Fixes #3793.
Jonas Tull [Thu, 14 Jul 2011 14:15:24 +0000 (16:15 +0200)]
Added contact_line and rail to key:electrified. Fixes #3793.

10 years agoAdded recycling scheme and recycling_type for amenity=recycling. Fixes #3791.
Jonas Tull [Thu, 14 Jul 2011 14:11:15 +0000 (16:11 +0200)]
Added recycling scheme and recycling_type for amenity=recycling. Fixes #3791.

10 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.

10 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

10 years agoDocument the other custom Controls
Andy Allan [Wed, 6 Jul 2011 17:43:41 +0000 (18:43 +0100)]
Document the other custom Controls

10 years agoFix spelling mistake, and add missing package description for find
Andy Allan [Wed, 6 Jul 2011 17:18:17 +0000 (18:18 +0100)]
Fix spelling mistake, and add missing package description for find

10 years agoSupport bbox-limited vector background layers. Only checked on first load.
Andy Allan [Wed, 6 Jul 2011 14:18:25 +0000 (15:18 +0100)]
Support bbox-limited vector background layers. Only checked on first load.

10 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.