potlatch2.git
9 years agoMerge branch 'master' into history
Andy Allan [Fri, 30 Sep 2011 18:12:27 +0000 (19:12 +0100)]
Merge branch 'master' into history

9 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

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

9 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

9 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

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

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

9 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

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

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

9 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

9 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

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

9 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

9 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

9 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

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

9 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!

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

9 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

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

9 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

9 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

9 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

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

9 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

9 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

9 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...).

9 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

9 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

9 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

9 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"

9 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)

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

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

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

9 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

9 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

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

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

9 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!

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

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

9 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

9 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!

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

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

9 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

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

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

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

9 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

9 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

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

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

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

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

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

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

9 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

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

9 years agoAdd resources/generated to .gitignore
Richard Fairhurst [Tue, 5 Jul 2011 16:08:58 +0000 (17:08 +0100)]
Add resources/generated to .gitignore

9 years agoRemove previous bugfix for tab selection - no longer needed with Flex 4.5 as Adobe...
Richard Fairhurst [Tue, 5 Jul 2011 16:07:29 +0000 (17:07 +0100)]
Remove previous bugfix for tab selection - no longer needed with Flex 4.5 as Adobe have fixed it in the source \o/

9 years agoMove to Flex 4.5 version of flexlib. Still needs work to fix the SuperTabNavigation...
Richard Fairhurst [Tue, 5 Jul 2011 16:06:49 +0000 (17:06 +0100)]
Move to Flex 4.5 version of flexlib. Still needs work to fix the SuperTabNavigation scrolling arrows' appearance (this is a flexlib bug)

9 years agoMerge remote-tracking branch 'gravitystorm/flex4' into flex4
Richard Fairhurst [Tue, 5 Jul 2011 11:13:50 +0000 (12:13 +0100)]
Merge remote-tracking branch 'gravitystorm/flex4' into flex4

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

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

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

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

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

9 years agoFix bizarre E4X failure
Andy Allan [Thu, 30 Jun 2011 16:29:23 +0000 (17:29 +0100)]
Fix bizarre E4X failure

9 years agoNamespacing upgrade. Oh Adobe, how we love your outdated and self-contradictory upgra...
Andy Allan [Wed, 29 Jun 2011 18:01:08 +0000 (19:01 +0100)]
Namespacing upgrade. Oh Adobe, how we love your outdated and self-contradictory upgrade guides.

9 years agoMore nasty casting of TextInput
Andy Allan [Wed, 29 Jun 2011 17:59:20 +0000 (18:59 +0100)]
More nasty casting of TextInput

9 years agoRemove the mx.events.VideoEvent import, since it clashes with flash.video.VideoEvent
Andy Allan [Wed, 29 Jun 2011 17:57:56 +0000 (18:57 +0100)]
Remove the mx.events.VideoEvent import, since it clashes with flash.video.VideoEvent

9 years agoAlter the remaining Application.application occurancies
Andy Allan [Wed, 29 Jun 2011 17:56:52 +0000 (18:56 +0100)]
Alter the remaining Application.application occurancies

9 years agoEnable the (old) Halo theme, for now. We'll move to the Spark theme at some point
Andy Allan [Wed, 29 Jun 2011 17:47:54 +0000 (18:47 +0100)]
Enable the (old) Halo theme, for now. We'll move to the Spark theme at some point

9 years agoAdd namespaces for components
Andy Allan [Wed, 29 Jun 2011 17:47:08 +0000 (18:47 +0100)]
Add namespaces for components

9 years agoUgly casts to mx:TextInput for now - should be revisited and done betterer
Andy Allan [Wed, 29 Jun 2011 16:14:10 +0000 (17:14 +0100)]
Ugly casts to mx:TextInput for now - should be revisited and done betterer

9 years agoUse selectRange instead of setSelection, in order to match ITextInput instead of...
Andy Allan [Wed, 29 Jun 2011 16:13:10 +0000 (17:13 +0100)]
Use selectRange instead of setSelection, in order to match ITextInput instead of just mx:TextInput

9 years agoRemove the deprectated Application.application
Andy Allan [Wed, 29 Jun 2011 14:35:36 +0000 (15:35 +0100)]
Remove the deprectated Application.application

9 years agoUpdate docs for flex4
Andy Allan [Wed, 29 Jun 2011 14:15:56 +0000 (15:15 +0100)]
Update docs for flex4

9 years agoremove the target-player, since it's implied by flex4
Andy Allan [Wed, 29 Jun 2011 14:12:26 +0000 (15:12 +0100)]
remove the target-player, since it's implied by flex4

10 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

10 years agoUpdate history dialog with new Connection and Entity syntax
Andy Allan [Wed, 22 Jun 2011 16:12:43 +0000 (17:12 +0100)]
Update history dialog with new Connection and Entity syntax

10 years agoMerge branch 'master' into history
Andy Allan [Wed, 22 Jun 2011 15:50:34 +0000 (16:50 +0100)]
Merge branch 'master' into history

Conflicts:
TODO.txt
net/systemeD/halcyon/connection/Changeset.as
net/systemeD/halcyon/connection/Connection.as
net/systemeD/halcyon/connection/Entity.as
net/systemeD/halcyon/connection/EntityCollection.as
net/systemeD/halcyon/connection/Marker.as
net/systemeD/halcyon/connection/Node.as
net/systemeD/halcyon/connection/Relation.as
net/systemeD/halcyon/connection/Way.as
net/systemeD/halcyon/connection/XMLBaseConnection.as
net/systemeD/potlatch2/TagViewer.mxml
net/systemeD/potlatch2/controller/ControllerState.as

10 years agoUpdate documentation target for fp10
Andy Allan [Wed, 22 Jun 2011 15:22:14 +0000 (16:22 +0100)]
Update documentation target for fp10

10 years agoUpdate CODING to reflect fp10 target
Andy Allan [Mon, 23 May 2011 09:38:25 +0000 (10:38 +0100)]
Update CODING to reflect fp10 target

10 years agoConvert the traces handling to use vectors
Andy Allan [Sun, 22 May 2011 12:27:17 +0000 (13:27 +0100)]
Convert the traces handling to use vectors

10 years agoAdd target-player for the test compiler - the others don't seem to need it (for unkno...
Andy Allan [Sun, 22 May 2011 12:26:34 +0000 (13:26 +0100)]
Add target-player for the test compiler - the others don't seem to need it (for unknown reasons)

10 years agodos2unix all text files
Andy Allan [Wed, 22 Jun 2011 15:05:49 +0000 (16:05 +0100)]
dos2unix all text files

10 years agoTarget flash player 10. Allows use of Vector class and local filesystem access
Andy Allan [Sun, 22 May 2011 10:12:16 +0000 (11:12 +0100)]
Target flash player 10. Allows use of Vector class and local filesystem access

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

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

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

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

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

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

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

10 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

10 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