Merge remote-tracking branch 'richardf/flex4' into flex4

Conflicts: resources/imagery.xml
systemed · Sep 30, 2011 · 1a8fc2e · 1a8fc2e
2 parents 7141f15 + 5b211c2
commit 1a8fc2e
Show file tree

Hide file tree

Showing 8 changed files with 2,089 additions and 12 deletions.
diff --git a/net/systemeD/potlatch2/collections/Imagery.as b/net/systemeD/potlatch2/collections/Imagery.as
@@ -95,26 +95,24 @@ package net.systemeD.potlatch2.collections {
             }
 
 			// Get any attribution and logo details
-			for each (bg in collection) {
+			collection.forEach(function(bg:Object, index:int, array:Array):void {
 				if (bg.logo) {
 					// load the logo
 					var loader:Loader = new Loader();
-					var thisbg1:Object = bg;			// scope it for the closure
-					loader.contentLoaderInfo.addEventListener(Event.COMPLETE, function(e:Event):void { onLogoLoad(e,thisbg1); });
+					loader.contentLoaderInfo.addEventListener(Event.COMPLETE, function(e:Event):void { onLogoLoad(e,bg); });
 					loader.contentLoaderInfo.addEventListener(IOErrorEvent.IO_ERROR, onError);
 					loader.contentLoaderInfo.addEventListener(SecurityErrorEvent.SECURITY_ERROR, onError);
 					loader.load(new URLRequest(bg.logo));
 				}
 				if (bg.attribution_url) {
 					// load the attribution
 			        var urlloader:URLLoader = new URLLoader();
-					var thisbg2:Object = bg;			// scope it for the closure
-					urlloader.addEventListener(Event.COMPLETE, function(e:Event):void { onAttributionLoad(e,thisbg2); });
+					urlloader.addEventListener(Event.COMPLETE, function(e:Event):void { onAttributionLoad(e,bg); });
 					urlloader.addEventListener(IOErrorEvent.IO_ERROR, onError);
 					urlloader.addEventListener(SecurityErrorEvent.SECURITY_ERROR, onError);
 			        urlloader.load(new URLRequest(bg.attribution_url));
 				}
-			}
+			});
 
 			// Tell the function key manager that we'd like to receive function key calls
 			FunctionKeyManager.instance().registerListener('Background imagery',

diff --git a/net/systemeD/potlatch2/help/HelpDialog.mxml b/net/systemeD/potlatch2/help/HelpDialog.mxml
@@ -110,19 +110,21 @@
                           ["/", "Cycle through overlapping ways"],
                           ];
         var text2:Array =  [["+", "Add new tag"],
+                            [", .", "Cycle through nodes in way"],
                             ["D", "Dim features"],
                             ["F", "Follow existing way"],
-                            ["R", "Repeat tags"],
-                            ["T", "Toggle between simple and advanced tags"],
+                            ["M", "Maximise editor"],
                             ["P", "Create parallel way"],
-                            ["V", "Reverse direction of way"]
+                            ["Q", "Make area right-angled"],
+                            ["R", "Repeat tags"],
                             ];
-        var text3:Array =  [["Q", "Make area right-angled"],
-                            ["S", "Save"],
+        var text3:Array =  [["S", "Save"],
+                            ["T", "Toggle between simple and advanced tags"],
+                            ["V", "Reverse direction of way"],
                             ["X", "Cut way at node"],
                             ["Z", "Undo"],
                             ["Esc", "Cancel edit"],
-                            ["Space", "Hold to realign background image"]
+                            ["Space", "Hold/drag to realign background image"]
                             ];
         shortcuts1.addChild(buildGrid(text));
         shortcuts2a.addChild(buildGrid(text2));

diff --git a/resources/features/route__mtb.png b/resources/features/route__mtb.png
diff --git a/resources/imagery.xml b/resources/imagery.xml
@@ -117,5 +117,20 @@
 		<name>Denmark - Stevns Kommune</name>
 		<url>http://tile.openstreetmap.dk/stevns/2009/$z/$x/$y.jpg</url>
 		<sourcetag>Stevns Kommune (2009)</sourcetag>
+    </set>
+	<set minlat="46.33" minlon="9.36" maxlat="49.09" maxlon="17.28">
+		<name>Austria - geoimage.at</name>
+		<url>http://geoimage.openstreetmap.at/4d80de696cd562a63ce463a58a61488d/$z/$x/$y.jpg</url>
+		<sourcetag>geoimage.at</sourcetag>
+	</set>
+	<set minlon="19.02" minlat="40.96" maxlon="77.34" maxlat="70.48">
+		<name>Russia - Kosmosnimki.ru IRS Satellite</name>
+		<url>http://irs.gis-lab.info/?layers=irs&request=GetTile&z=$z&x=$x&y=$y</url>
+		<sourcetag>Kosmosnimki.ru IRS</sourcetag>
+	</set>
+	<set minlon="23.16" minlat="51.25" maxlon="32.83" maxlat="56.19">
+		<name>Belarus - Kosmosnimki.ru SPOT4 Satellite</name>
+		<url>http://irs.gis-lab.info/?layers=spot&request=GetTile&z=$z&x=$x&y=$y</url>
+		<sourcetag>Kosmosnimki.ru SPOT4</sourcetag>
 	</set>
 </imagery>
diff --git a/resources/map_features.xml b/resources/map_features.xml
@@ -397,6 +397,14 @@
         <font size="12pt">${name}</font>
       </icon>
     </input>
+    <input type="route" name="Mountain bike route" description="A signposted route for mountain biking." category="Cycle" priority="lowest">
+      <match k="type" v="route"/>
+      <match k="route" v="mtb"/>
+      <icon image="features/route__mtb.png" background="#9f4404" foreground="white">
+        <font size="14pt"><b>${ref}</b></font><br/>
+        <font size="12pt">${name}</font>
+      </icon>
+    </input>
   </inputSet>
 
   <inputSet id="bicycle-permission">

diff --git a/resources/map_features/paths.xml b/resources/map_features/paths.xml
@@ -143,6 +143,31 @@
     <inputSet ref="route"/>
     <inputSet ref="common"/>
   </feature>
+
+  <feature name="Mountain bike route">
+    <category>paths</category>
+    <icon image="features/route__mtb.png" background="#9f4404" foreground="white">
+      <font size="14pt">
+        <b>${ref}</b>
+      </font>
+      <br/>
+      <font size="12pt">${name}</font>
+    </icon>
+
+    <relation/>
+    <tag k="type" v="route"/>
+    <tag k="route" v="mtb"/>
+
+    <input type="choice" presence="always" category="Details" name="Route type" key="mtb:type" description="What type of route is it?">
+      <choice value="crosscountry" text="Cross-country"/>
+      <choice value="allmountain" text="All-mountain"/>
+      <choice value="freeride" text="Freeride"/>
+      <choice value="downhill" text="Downhill"/>
+      <choice value="trial" text="Trial"/>
+    </input>
+    <inputSet ref="route"/>
+    <inputSet ref="common"/>
+  </feature>
 
   <!-- hiking -->
 

diff --git a/resources/stylesheets/core_relations.css b/resources/stylesheets/core_relations.css
@@ -4,4 +4,5 @@ relation[type=route] way::route { z-index: 1; width: 13; color: blue; opacity: 0
 relation[type=route][route=bicycle][network=ncn] way::route { z-index: 1; width: 12; color: red; opacity: 0.3; }
 relation[type=route][route=bicycle][network=rcn] way::route { z-index: 1; width: 12; color: cyan; opacity: 0.3; }
 relation[type=route][route=bicycle][network=lcn] way::route { z-index: 1; width: 12; color: blue; opacity: 0.3; }
+relation[type=route][route=mtb] way::route { z-index: 1; width: 12; color: brown; opacity: 0.3; }
 relation[type=route][route=foot] way::route { z-index: 1; width: 10; color: #80ff80; opacity: 0.6; }
diff --git a/resources_src/route__mtb.ai b/resources_src/route__mtb.ai