potlatch2.git
7 years agoOnly use previousState in DragBackground; fixes memory leak
Richard Fairhurst [Sat, 12 May 2012 10:10:33 +0000 (11:10 +0100)]
Only use previousState in DragBackground; fixes memory leak

7 years agoMerge pull request #65 from stevage/2501-repeated-nodes-after-merge
Richard Fairhurst [Sat, 5 May 2012 20:18:06 +0000 (13:18 -0700)]
Merge pull request #65 from stevage/2501-repeated-nodes-after-merge

Fix #2501 with a special check for repeated nodes. Bonus documentation of ReplaceNodeWithNewAction.

7 years agoFix #2501 with a special check for repeated nodes. Bonus documentation of ReplaceNode...
Steve Bennett [Sat, 5 May 2012 16:49:10 +0000 (02:49 +1000)]
Fix #2501 with a special check for repeated nodes. Bonus documentation of ReplaceNodeWithNewAction.

7 years agoMerge pull request #63 from rnorris/patches
Richard Fairhurst [Sat, 5 May 2012 09:54:28 +0000 (02:54 -0700)]
Merge pull request #63 from rnorris/patches

Allow speedier build options

7 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Thu, 3 May 2012 21:59:17 +0000 (21:59 +0000)]
Localisation updates from translatewiki.net.

7 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Sun, 29 Apr 2012 23:03:24 +0000 (23:03 +0000)]
Localisation updates from translatewiki.net.

7 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Sat, 21 Apr 2012 10:25:51 +0000 (10:25 +0000)]
Localisation updates from translatewiki.net.

7 years agoAllow speedier build options by adding 'debug-no-locales' and 'release-no-locales...
Rob Norris [Wed, 18 Apr 2012 18:52:07 +0000 (19:52 +0100)]
Allow speedier build options by adding 'debug-no-locales' and 'release-no-locales' to build without i8n.

Rework the build file slighty to allow commonization and document usage in the README.txt

7 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Sun, 15 Apr 2012 12:04:55 +0000 (12:04 +0000)]
Localisation updates from translatewiki.net.

7 years agoMerge pull request #62 from rnorris/iconsOCM
Richard Fairhurst [Mon, 9 Apr 2012 16:36:03 +0000 (09:36 -0700)]
Merge pull request #62 from rnorris/iconsOCM

Improve cyclemap editing to show bicycle shops on the edit map.

7 years agoImprove cyclemap editing to show bicycle shops on the edit map.
Rob Norris [Mon, 9 Apr 2012 13:38:33 +0000 (14:38 +0100)]
Improve cyclemap editing to show bicycle shops on the edit map.

The OpenCycleMap map tiles give bicycle shops prominence, so also give them prominence in the cyclemap edit mode.

7 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Sun, 8 Apr 2012 23:01:38 +0000 (01:01 +0200)]
Localisation updates from translatewiki.net.

7 years agoMerge pull request #61 from rnorris/icons
Richard Fairhurst [Fri, 6 Apr 2012 08:05:09 +0000 (01:05 -0700)]
Merge pull request #61 from rnorris/icons

Ensure (practically) all POIs that can be created by the side panel have...

7 years agoEnsure (practically) all POIs that can be created by the side panel have the correspo...
Rob Norris [Thu, 5 Apr 2012 22:23:54 +0000 (23:23 +0100)]
Ensure (practically) all POIs that can be created by the side panel have the corresponding icon on the actual map overlay.

Previously about 40 supported POIs result in a basic green dot on the map. This makes it hard to tell what each one is on the map (apart from selecting each one in turn).

Icons were generated from the existing icons in the resources/features/pois and resources/features/ directories.

Used some bash commands with ImageMagick to resize and name them appropriately - such as:

for x in *24*png; do convert -resize 16x16 $x ../../icons/${x/24/16}; done

7 years agoChoose new CategorySelector when going from line to area
Richard Fairhurst [Fri, 30 Mar 2012 12:11:53 +0000 (13:11 +0100)]
Choose new CategorySelector when going from line to area

7 years agoDeep diff history!
Richard Fairhurst [Fri, 30 Mar 2012 12:03:12 +0000 (13:03 +0100)]
Deep diff history!

7 years agoMerge pull request #59 from tomhughes/master
Richard Fairhurst [Tue, 27 Mar 2012 12:36:08 +0000 (05:36 -0700)]
Merge pull request #59 from tomhughes/master

Stop pedestrian access field getting mixed up with foot routes

7 years agoStop pedestrian access field getting mixed up with foot routes
Tom Hughes [Tue, 27 Mar 2012 11:43:38 +0000 (12:43 +0100)]
Stop pedestrian access field getting mixed up with foot routes

Also makes long distance path routes available on more highway types.

7 years agoMerge pull request #57 from 1ec5/patch-1
Richard Fairhurst [Tue, 27 Mar 2012 10:26:48 +0000 (03:26 -0700)]
Merge pull request #57 from 1ec5/patch-1

Update NAIP URL

7 years agoFixed NAIP linkrot
Minh Nguyễn [Tue, 27 Mar 2012 09:36:16 +0000 (02:36 -0700)]
Fixed NAIP linkrot

7 years agoMerge pull request #56 from tomhughes/master
Richard Fairhurst [Tue, 27 Mar 2012 08:54:38 +0000 (01:54 -0700)]
Merge pull request #56 from tomhughes/master

Load RouteIcon images through the FileBank

7 years agoLoad RouteIcon images through the FileBank
Tom Hughes [Tue, 27 Mar 2012 08:07:49 +0000 (09:07 +0100)]
Load RouteIcon images through the FileBank

7 years agoMerge pull request #55 from tomhughes/master
Richard Fairhurst [Sun, 25 Mar 2012 21:28:11 +0000 (14:28 -0700)]
Merge pull request #55 from tomhughes/master

Rework handling of choice editor images

7 years agoRework handling of choice editor images
Tom Hughes [Sun, 25 Mar 2012 20:19:23 +0000 (21:19 +0100)]
Rework handling of choice editor images

I have no idea why this aproach works better, but it seems to lead
to more reliable loading of the images and is closer to the way the
original pre-FileBank code worked.

7 years agoRestyle drag-and-drop panel
Richard Fairhurst [Sun, 25 Mar 2012 19:18:14 +0000 (20:18 +0100)]
Restyle drag-and-drop panel

7 years agoMerge branch 'master' of https://github.com/systemed/potlatch2
Richard Fairhurst [Sun, 25 Mar 2012 18:40:43 +0000 (19:40 +0100)]
Merge branch 'master' of https://github.com/systemed/potlatch2

7 years agoFix formatting, and restore Relation method
Richard Fairhurst [Sun, 25 Mar 2012 18:40:01 +0000 (19:40 +0100)]
Fix formatting, and restore Relation method
(a method for this already exists)

7 years agoMerge remote-tracking branch 'stevage/repeat-relations-3596' into repeatrelations
Richard Fairhurst [Sun, 25 Mar 2012 18:32:35 +0000 (19:32 +0100)]
Merge remote-tracking branch 'stevage/repeat-relations-3596' into repeatrelations

7 years agoMerge pull request #46 from stevage/natural-beach2
Richard Fairhurst [Sun, 25 Mar 2012 18:27:44 +0000 (11:27 -0700)]
Merge pull request #46 from stevage/natural-beach2

Add natural=beach with an original icon.

7 years agoMerge pull request #40 from stevage/vet-pool-4128
Richard Fairhurst [Sun, 25 Mar 2012 18:26:35 +0000 (11:26 -0700)]
Merge pull request #40 from stevage/vet-pool-4128

Add vet, and indoor/outdoor swimming pool distinction, as per http://tra...

7 years agoRemove compiler warnings (please check before committing!)
Richard Fairhurst [Sun, 25 Mar 2012 18:24:22 +0000 (19:24 +0100)]
Remove compiler warnings (please check before committing!)

7 years agoRemove dupe entry
Richard Fairhurst [Sun, 25 Mar 2012 18:10:41 +0000 (19:10 +0100)]
Remove dupe entry

7 years agoMerge pull request #42 from stevage/train-routes
Richard Fairhurst [Sun, 25 Mar 2012 18:07:10 +0000 (11:07 -0700)]
Merge pull request #42 from stevage/train-routes

Add train routes

7 years agoMake compatible with Yahoo change
Richard Fairhurst [Sun, 25 Mar 2012 18:04:10 +0000 (19:04 +0100)]
Make compatible with Yahoo change

7 years agoInitialise the tile set in case the imagery catalogue has already loaded
Richard Fairhurst [Sun, 25 Mar 2012 18:03:19 +0000 (19:03 +0100)]
Initialise the tile set in case the imagery catalogue has already loaded
from https://github.com/tomhughes/potlatch2/commit/7875a252f6ea84abb2fe6e0019da1366bc701740

7 years agoMerge pull request #39 from stevage/fix-tram-route-editor
Richard Fairhurst [Sun, 25 Mar 2012 17:08:31 +0000 (10:08 -0700)]
Merge pull request #39 from stevage/fix-tram-route-editor

Fix bug to make tram routes show up on simple editor for tram lines.

7 years agoMerge pull request #43 from stevage/voltage-tweaks
Richard Fairhurst [Sun, 25 Mar 2012 17:07:36 +0000 (10:07 -0700)]
Merge pull request #43 from stevage/voltage-tweaks

Voltage tweaks

7 years agoMerge pull request #41 from stevage/pedestrian-crossings
Richard Fairhurst [Sun, 25 Mar 2012 17:07:11 +0000 (10:07 -0700)]
Merge pull request #41 from stevage/pedestrian-crossings

Add pedestrian crossings and traffic signals to map_features.

7 years agoFixes after Importer refactoring
Richard Fairhurst [Sun, 25 Mar 2012 16:51:27 +0000 (17:51 +0100)]
Fixes after Importer refactoring

7 years agoMerge remote-tracking branch 'gravitystorm/cartography'
Richard Fairhurst [Sun, 25 Mar 2012 16:44:08 +0000 (17:44 +0100)]
Merge remote-tracking branch 'gravitystorm/cartography'

7 years agoicon_width is circumference, not radius
Richard Fairhurst [Sun, 25 Mar 2012 16:42:21 +0000 (17:42 +0100)]
icon_width is circumference, not radius

7 years agoMerge remote-tracking branch 'gravitystorm/sparkification'
Richard Fairhurst [Sun, 25 Mar 2012 15:55:08 +0000 (16:55 +0100)]
Merge remote-tracking branch 'gravitystorm/sparkification'

7 years agoMerge remote-tracking branch 'gravitystorm/history'
Richard Fairhurst [Sun, 25 Mar 2012 15:52:18 +0000 (16:52 +0100)]
Merge remote-tracking branch 'gravitystorm/history'

7 years agoMerge remote-tracking branch 'gravitystorm/mygpx'
Richard Fairhurst [Sun, 25 Mar 2012 15:32:41 +0000 (16:32 +0100)]
Merge remote-tracking branch 'gravitystorm/mygpx'

7 years agoMerge remote-tracking branch 'gravitystorm/yahoo'
Richard Fairhurst [Sun, 25 Mar 2012 15:31:55 +0000 (16:31 +0100)]
Merge remote-tracking branch 'gravitystorm/yahoo'

7 years agoMerge remote-tracking branch 'gravitystorm/compiler'
Richard Fairhurst [Sun, 25 Mar 2012 15:31:15 +0000 (16:31 +0100)]
Merge remote-tracking branch 'gravitystorm/compiler'

7 years agoDon't try the callback if there isn't one
Richard Fairhurst [Sun, 25 Mar 2012 15:30:00 +0000 (16:30 +0100)]
Don't try the callback if there isn't one

7 years agoMerge branch 'localfile'
Richard Fairhurst [Sun, 25 Mar 2012 15:24:09 +0000 (16:24 +0100)]
Merge branch 'localfile'

7 years agoLoad tag transformations, too
Richard Fairhurst [Sun, 25 Mar 2012 15:04:46 +0000 (16:04 +0100)]
Load tag transformations, too

7 years agoKeep the asdoc compiler happy about some theme based something or other.
Andy Allan [Sun, 25 Mar 2012 15:03:09 +0000 (16:03 +0100)]
Keep the asdoc compiler happy about some theme based something or other.

7 years agoWe welcome our new imagery-based overlords.
Andy Allan [Sun, 25 Mar 2012 15:01:33 +0000 (16:01 +0100)]
We welcome our new imagery-based overlords.

7 years agoRemove the vestigial Yahoo code and library.
Andy Allan [Sun, 25 Mar 2012 14:58:53 +0000 (15:58 +0100)]
Remove the vestigial Yahoo code and library.

7 years agoZip support, including for local shapefiles
Richard Fairhurst [Sun, 25 Mar 2012 14:53:09 +0000 (15:53 +0100)]
Zip support, including for local shapefiles

7 years agoMerge pull request #53 from tomhughes/master
Richard Fairhurst [Sun, 25 Mar 2012 14:15:59 +0000 (07:15 -0700)]
Merge pull request #53 from tomhughes/master

Features fix

7 years agoDon't wait for feature images before firing feauresloaded
Tom Hughes [Sun, 25 Mar 2012 14:13:18 +0000 (15:13 +0100)]
Don't wait for feature images before firing feauresloaded

7 years agoZip in progress
Richard Fairhurst [Sun, 25 Mar 2012 14:12:03 +0000 (15:12 +0100)]
Zip in progress

7 years agoTurn square nodes into circles.
Andy Allan [Sun, 25 Mar 2012 14:01:15 +0000 (15:01 +0100)]
Turn square nodes into circles.

7 years agoTweak colours, text size and add some round linecaps to roads, paths and railways.
Andy Allan [Sun, 25 Mar 2012 13:48:42 +0000 (14:48 +0100)]
Tweak colours, text size and add some round linecaps to roads, paths and railways.

7 years agoBump font size for points of interest.
Andy Allan [Sun, 25 Mar 2012 13:46:27 +0000 (14:46 +0100)]
Bump font size for points of interest.

7 years agoLighten oneway arrows.
Andy Allan [Sun, 25 Mar 2012 13:43:54 +0000 (14:43 +0100)]
Lighten oneway arrows.

7 years agoDesaturate the water colour slightly.
Andy Allan [Sun, 25 Mar 2012 13:43:10 +0000 (14:43 +0100)]
Desaturate the water colour slightly.

7 years agoTone down the building outline colour.
Andy Allan [Sun, 25 Mar 2012 13:40:29 +0000 (14:40 +0100)]
Tone down the building outline colour.

7 years agoIncrease the size of the area text.
Andy Allan [Sun, 25 Mar 2012 13:39:38 +0000 (14:39 +0100)]
Increase the size of the area text.

7 years agoDetect and report errors opening a changeset
Tom Hughes [Sun, 25 Mar 2012 13:25:30 +0000 (14:25 +0100)]
Detect and report errors opening a changeset

7 years agoLocal file vector import (not .shp yet)
Richard Fairhurst [Sun, 25 Mar 2012 13:20:31 +0000 (14:20 +0100)]
Local file vector import (not .shp yet)

7 years agoRefactoring importers
Richard Fairhurst [Sun, 25 Mar 2012 12:53:31 +0000 (13:53 +0100)]
Refactoring importers

7 years agoMerge pull request #52 from tomhughes/filebank
Richard Fairhurst [Sun, 25 Mar 2012 12:51:11 +0000 (05:51 -0700)]
Merge pull request #52 from tomhughes/filebank

Filebank

7 years agoAllow custom locale URLs to be set via a parameter
Tom Hughes [Sun, 25 Mar 2012 11:10:10 +0000 (12:10 +0100)]
Allow custom locale URLs to be set via a parameter

7 years agoAllow the font library path to be specified with a parameter
Tom Hughes [Sun, 25 Mar 2012 10:01:53 +0000 (11:01 +0100)]
Allow the font library path to be specified with a parameter

7 years agoLoad imagery logos through FileBank
Tom Hughes [Sat, 24 Mar 2012 19:34:30 +0000 (19:34 +0000)]
Load imagery logos through FileBank

7 years agoRemove DebugURLRequest as it is no longer used
Tom Hughes [Sat, 24 Mar 2012 19:24:31 +0000 (19:24 +0000)]
Remove DebugURLRequest as it is no longer used

7 years agoLoad vector background catalogue through FileBank
Tom Hughes [Sat, 24 Mar 2012 19:21:17 +0000 (19:21 +0000)]
Load vector background catalogue through FileBank

7 years agoLoad imagery catalogue through FileBank
Tom Hughes [Sat, 24 Mar 2012 19:20:56 +0000 (19:20 +0000)]
Load imagery catalogue through FileBank

7 years agoLoad the stylesheet catalogue through FileBank
Tom Hughes [Sat, 24 Mar 2012 19:16:29 +0000 (19:16 +0000)]
Load the stylesheet catalogue through FileBank

7 years agoSparkify "Add new vector layer" form
Richard Fairhurst [Sun, 25 Mar 2012 11:33:37 +0000 (12:33 +0100)]
Sparkify "Add new vector layer" form

7 years agoMove dialogs into a dialogs/ directory
Richard Fairhurst [Sun, 25 Mar 2012 10:56:36 +0000 (11:56 +0100)]
Move dialogs into a dialogs/ directory

7 years agoMerge remote-tracking branch 'gravitystorm/choices'
Richard Fairhurst [Sun, 25 Mar 2012 10:35:13 +0000 (11:35 +0100)]
Merge remote-tracking branch 'gravitystorm/choices'

7 years agoJust use the dataCollection directly, since flex can bind to the arraycollection.
Andy Allan [Sun, 25 Mar 2012 10:30:04 +0000 (11:30 +0100)]
Just use the dataCollection directly, since flex can bind to the arraycollection.

7 years agoSet a dummy field on the datagridcolumn, since typed objects don't respond to the...
Andy Allan [Sun, 25 Mar 2012 10:28:24 +0000 (11:28 +0100)]
Set a dummy field on the datagridcolumn, since typed objects don't respond to the 'null' method.

7 years agoDon't try to access the source collection directly, instead use the getCollection...
Andy Allan [Sun, 25 Mar 2012 10:26:59 +0000 (11:26 +0100)]
Don't try to access the source collection directly, instead use the getCollection accessor.

7 years agoMerge branch 'draganddrop'
Richard Fairhurst [Sun, 25 Mar 2012 10:17:54 +0000 (11:17 +0100)]
Merge branch 'draganddrop'

7 years agoMerge pull request #51 from stevage/tweak-parallel-way
Richard Fairhurst [Sun, 25 Mar 2012 10:14:18 +0000 (03:14 -0700)]
Merge pull request #51 from stevage/tweak-parallel-way

Tweak parallel way

7 years agoTreat <corestyle>no</corestyle> as false, since that's what's in use.
Andy Allan [Sun, 25 Mar 2012 10:09:48 +0000 (11:09 +0100)]
Treat <corestyle>no</corestyle> as false, since that's what's in use.

7 years agoSparkification of the options dialog, with the exception of the HSlider which would...
Andy Allan [Sun, 25 Mar 2012 09:25:30 +0000 (10:25 +0100)]
Sparkification of the options dialog, with the exception of the HSlider which would require a skin to be created.

7 years agoPrevent parallel way creation leaving entries in Undo stack if way creation is aborted.
Steve Bennett [Sun, 25 Mar 2012 08:48:09 +0000 (19:48 +1100)]
Prevent parallel way creation leaving entries in Undo stack if way creation is aborted.

7 years agoDon't refresh the CategorySelector unless we need to
Richard Fairhurst [Sat, 24 Mar 2012 19:34:47 +0000 (19:34 +0000)]
Don't refresh the CategorySelector unless we need to
(fixes issues with dropdowns)

7 years agoFix the cramped checkboxes, and center them.
Andy Allan [Sat, 24 Mar 2012 19:32:40 +0000 (19:32 +0000)]
Fix the cramped checkboxes, and center them.

7 years agoConvert the stylesheet collection to be a vector of 'Stylesheet' typed objects. Enabl...
Andy Allan [Sat, 24 Mar 2012 19:27:49 +0000 (19:27 +0000)]
Convert the stylesheet collection to be a vector of 'Stylesheet' typed objects. Enables the current stylesheet to be highlighted on the menu.

7 years agoRemove attempt to make preloader block until zips are loaded
Tom Hughes [Sat, 24 Mar 2012 19:05:56 +0000 (19:05 +0000)]
Remove attempt to make preloader block until zips are loaded

It didn't work anyway, so get rid of it and just get FileBank to
queue any file requests that come in while zips are loading and
replay them once the zips are loaded.

7 years agoHandle asset files with no prefix
Tom Hughes [Sat, 24 Mar 2012 16:47:55 +0000 (16:47 +0000)]
Handle asset files with no prefix

7 years agoLoad CSS files through the FileBank
Tom Hughes [Sat, 24 Mar 2012 16:17:56 +0000 (16:17 +0000)]
Load CSS files through the FileBank

7 years agoLoad XML files through the FileBank
Tom Hughes [Sat, 24 Mar 2012 16:03:08 +0000 (16:03 +0000)]
Load XML files through the FileBank

7 years agoTidy up tagChanged eventListeners
Richard Fairhurst [Sat, 24 Mar 2012 18:45:52 +0000 (18:45 +0000)]
Tidy up tagChanged eventListeners

7 years agoFix the speed restriction editor by making the textinput have a transparent background.
Andy Allan [Sat, 24 Mar 2012 18:14:47 +0000 (18:14 +0000)]
Fix the speed restriction editor by making the textinput have a transparent background.

7 years agoBugfix - clear out tags before appending, to handle refreshing the trace data from...
Andy Allan [Sat, 24 Mar 2012 18:09:09 +0000 (18:09 +0000)]
Bugfix - clear out tags before appending, to handle refreshing the trace data from XML.

7 years agoRework the GPX load button to use outerDocument and handle the lack of typing on...
Andy Allan [Sat, 24 Mar 2012 18:05:33 +0000 (18:05 +0000)]
Rework the GPX load button to use outerDocument and handle the lack of typing on the data object.

7 years agoCheck for ExternalInterface before adding the callback
Andy Allan [Sat, 24 Mar 2012 18:04:47 +0000 (18:04 +0000)]
Check for ExternalInterface before adding the callback

7 years agoUse a separate error handler for trace failures, now that the map load error handler...
Andy Allan [Sat, 24 Mar 2012 18:04:13 +0000 (18:04 +0000)]
Use a separate error handler for trace failures, now that the map load error handler is map-call specific.

7 years agoSparkification, and center the load trace button.
Andy Allan [Sat, 24 Mar 2012 17:38:48 +0000 (17:38 +0000)]
Sparkification, and center the load trace button.

7 years agoSort traces in descending order by id, rather than whatever order they happen to...
Andy Allan [Sat, 24 Mar 2012 17:20:00 +0000 (17:20 +0000)]
Sort traces in descending order by id, rather than whatever order they happen to have been returned/parsed in.