Merge pull request #42 from stevage/train-routes
authorRichard Fairhurst <richard@systemeD.net>
Sun, 25 Mar 2012 18:07:10 +0000 (11:07 -0700)
committerRichard Fairhurst <richard@systemeD.net>
Sun, 25 Mar 2012 18:07:10 +0000 (11:07 -0700)
Add train routes

1  2 
net/systemeD/potlatch2/mapfeatures/Feature.as
resources/map_features.xml
resources/map_features/transport.xml

@@@ -8,12 -7,14 +7,13 @@@ package net.systemeD.potlatch2.mapfeatu
      import mx.core.BitmapAsset;
      import mx.graphics.codec.PNGEncoder;
      
 -    import net.systemeD.halcyon.ImageBank;
 +    import net.systemeD.halcyon.FileBank;
      import net.systemeD.halcyon.connection.Entity;
 -    import net.systemeD.potlatch2.utils.CachedDataLoader;
  
-         /** A "map feature" is sort of a template for a map entity. It consists of a few crucial key/value pairs that define the feature, so that
-          * entities can be recognised. It also contains optional keys, with associated editing controls, that are defined as being appropriate
-          * for the feature. */
+     /** A "map feature" is sort of a template for a map entity. It consists of a few crucial key/value pairs that define the feature, so that
+      * entities can be recognised. It also contains optional keys, with associated editing controls, that are defined as being appropriate
+      * for the feature. */
        public class Feature extends EventDispatcher {
          private var mapFeatures:MapFeatures;
          private var _xml:XML;
Simple merge
Simple merge