Merge remote-tracking branch 'richardf/flex4' into flex4
authorAndy Allan <andy@gravitystorm.co.uk>
Fri, 30 Sep 2011 16:35:35 +0000 (17:35 +0100)
committerAndy Allan <andy@gravitystorm.co.uk>
Fri, 30 Sep 2011 16:35:35 +0000 (17:35 +0100)
Conflicts:
resources/imagery.xml

23 files changed:
build.xml
net/systemeD/controls/DataGridWarningField.as
net/systemeD/halcyon/Map.as
net/systemeD/halcyon/connection/Connection.as
net/systemeD/halcyon/connection/Trace.as
net/systemeD/halcyon/connection/XMLBaseConnection.as
net/systemeD/halcyon/connection/XMLConnection.as
net/systemeD/halcyon/connection/actions/SetTagAction.as
net/systemeD/potlatch2/controller/ControllerState.as
net/systemeD/potlatch2/find/FindDialog.mxml
potlatch2.mxml
resources/imagery.xml
resources/map_features.xml
resources/map_features/amenities.xml
resources/map_features/barriers.xml
resources/map_features/landuse.xml
resources/map_features/man_made.xml
resources/map_features/paths.xml
resources/map_features/places.xml
resources/map_features/tourism.xml
resources/map_features/transport.xml
resources/potlatch2.html
resources/server.rb [changed mode: 0644->0755]

index bc8684cc12a24db412f910951c7aee2669de1aca..8e7b87fd5978c2332124a3055d1e95eb3aa30a7f 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -1,4 +1,4 @@
-<project name="Potlatch2 ├╝ber compile system" default="debug">
+<project name="Potlatch 2" default="debug">
 
   <!-- load properties from the environment -->
   <property environment="env" />
@@ -45,7 +45,7 @@
   </target>
 
   <!-- Build and output potlatch2.swf in release mode -->
-  <target name="release" depends="init">
+  <target name="release" depends="init"> <!-- FIXME convention is dist not release -->
     <mxmlc file="potlatch2.mxml">
       <load-config filename="${FLEX_HOME}/frameworks/flex-config.xml"/>
       <source-path path-element="${FLEX_HOME}/frameworks"/>
     <deployLocale locale="pl_PL" />
   </target>
 
+
+  <target name="clean"
+    description="clean up" >
+    <!-- Delete the ${build} and ${dist} directory trees -->
+    <!--
+
+    FIXME what is supposed to be cleaned?
+
+    <delete dir="${build}"/>
+    <delete dir="${dist}"/>
+
+    -->
+  </target>
+
+
 </project>
index dbc477784a9684485a32857b5e738e5d908dce64..47ac69959275068037a8aeb154a97cac14507e6a 100644 (file)
@@ -8,6 +8,7 @@ package net.systemeD.controls {
 
                private var _image:Image;
                [Embed(source="../../../embedded/warning.png")] private var warningIcon:Class;
+               private var _whiteList:Array = ["source","collection_times","service_times","smoking_hours","opening_hours"];
 
                function DataGridWarningField():void {
                        super();
@@ -25,8 +26,8 @@ package net.systemeD.controls {
 
                override protected function updateDisplayList(unscaledWidth:Number, unscaledHeight:Number):void {
                        super.updateDisplayList(unscaledWidth, unscaledHeight);
-                       if (data.value && data.value.indexOf(';')>-1) {
+
+                       if (data.value && (_whiteList.indexOf(data.key)==-1) && (data.value.indexOf(';')>-1)) { 
                                setStyle('color',0xFF0000);
                                _image.visible=true;
                                _image.x = width -_image.width -5;
index 8a45b074955be43ec35add9863ce76306e8dccca..1962177b7992257734d50fcfdd861bd8d8508074 100644 (file)
@@ -120,7 +120,7 @@ package net.systemeD.halcyon {
                // ------------------------------------------------------------------------------------------
                /** Recalculate co-ordinates from new Flash origin */
 
-               public function updateCoords(tx:Number,ty:Number):void {
+               private function updateCoords(tx:Number,ty:Number):void {
                        setScrollRectXY(tx,ty);
 
                        edge_t=coord2lat(-ty          );
@@ -133,7 +133,7 @@ package net.systemeD.halcyon {
                }
                
                /** Move the map to centre on a given latitude/longitude. */
-               public function updateCoordsFromLatLon(lat:Number,lon:Number):void {
+               private function updateCoordsFromLatLon(lat:Number,lon:Number):void {
                        var cy:Number=-(lat2coord(lat)-mapheight/2);
                        var cx:Number=-(lon2coord(lon)-mapwidth/2);
                        updateCoords(cx,cy);
index 8aa80d27198f610456016717002c75825d92ab78..07a43b7037236d6bfc4d6b8b97e8c30a1cc6862a 100644 (file)
@@ -439,7 +439,7 @@ package net.systemeD.halcyon.connection {
             return changeset;
         }
 
-        protected function addTrace(t:Trace):void {
+        public function addTrace(t:Trace):void {
             traces.push(t);
         }
 
@@ -447,6 +447,13 @@ package net.systemeD.halcyon.connection {
             traces = new Vector.<Trace>();
         }
 
+               public function findTrace(id:int):Trace {
+                       for each (var t:Trace in traces) {
+                               if (t.id == id) return t;
+                       }
+                       return null;
+               }
+
         public function getTraces():Vector.<Trace> {
             return traces;
         }
index 22a0b64e5a1e2b2cac890286027f169c9c43a2c5..8a4199ef740b1924768222a85a2cea46ea6e6a62 100644 (file)
@@ -24,7 +24,7 @@ package net.systemeD.halcyon.connection {
         private var _traceData:String; // the trace data, saved as a string
         private var map:Map;
         private var _layer:MapPaint;
-        private var masterConnection:XMLConnection; // The authenticated connection
+        private var masterConnection:Connection; // The authenticated connection
         private var _connection:Connection; // The one we store our fake nodes/ways in.
         private var simplify:Boolean = false;
 
@@ -33,9 +33,10 @@ package net.systemeD.halcyon.connection {
         /** Create a new trace.
         * @param masterConnection The authenticated connection to communicate with the server
         */
-        public function Trace(masterConnection:XMLConnection) {
+        public function Trace(masterConnection:Connection, id:int=0) {
             this.masterConnection = masterConnection;
             map = Globals.vars.root; // REFACTOR this prevents traces being added to arbitrary maps
+                       if (id!=0) _id=id;
         }
 
         /** Create a new trace, from the XML description given by the user/traces call.
@@ -112,6 +113,7 @@ package net.systemeD.halcyon.connection {
 
         private function processEvent(e:Event):void {
             removeEventListener("loaded_data", processEvent);
+            _isLoaded=true;
             process();
         }
 
index c94a8572b2533e01f1544551babdd4fa52b190f7..1fce3633f746e0462e12c1f5d10faee32ff86124 100644 (file)
@@ -22,7 +22,7 @@ package net.systemeD.halcyon.connection {
                protected function loadedMap(event:Event):void {
                        var map:XML = new XML(URLLoader(event.target).data);
                        
-                       if (map.localName=="osmError") {
+                       if (map.name().localName=="osmError") {
                                dispatchEvent(new MapEvent(MapEvent.ERROR, { message: "Couldn't load the map: " + map.message } ));
                        } else {
                                var id:Number;
index 3a4c5ef3bfaedb745ebfa39d1dd1d5f672b1db03..97f1e76299cddc7ada8cfcf4652269a3151274d5 100644 (file)
@@ -439,17 +439,17 @@ package net.systemeD.halcyon.connection {
             }
         }
 
-        private function tracesLoadComplete(event:Event):void {
-            clearTraces();
-            var files:XML = new XML(URLLoader(event.target).data);
-            for each(var traceData:XML in files.gpx_file) {
-              var t:Trace = new Trace(this).fromXML(traceData);
-              addTrace(t);
-            }
-            traces_loaded = true;
-            dispatchEvent(new Event(LOAD_COMPLETED));
-            dispatchEvent(new Event(TRACES_LOADED));
-        }
+               private function tracesLoadComplete(event:Event):void {
+                       var files:XML = new XML(URLLoader(event.target).data);
+                       for each(var traceData:XML in files.gpx_file) {
+                               var t:Trace = findTrace(traceData.@id);
+                               if (!t) { t=new Trace(this); addTrace(t); }
+                               t.fromXML(traceData);
+                       }
+                       traces_loaded = true;
+                       dispatchEvent(new Event(LOAD_COMPLETED));
+                       dispatchEvent(new Event(TRACES_LOADED));
+               }
 
         override public function fetchTrace(id:Number, callback:Function):void {
             sendOAuthGet(apiBaseURL+"gpx/"+id+"/data.xml", 
index c8b3bc6186cf3288c69641c27e4fcbe006cd0116..2117f4b0410a3dcfa8ed9d4ff69a5933459d6e1d 100644 (file)
@@ -17,7 +17,9 @@ package net.systemeD.halcyon.connection.actions {
         public override function doAction():uint {
             var tags:Object = entity.getTagsHash();
             oldValue = tags[key];
-            if ( value == null || key == '' || oldValue != value ) {
+
+            if ( !( ( entity.getTag(key) == null ) && ( value == null && oldValue == null ) ) &&
+                ( value == null || key == '' || oldValue != value ) ) {
                 if ( value == null || key == '' || value == '' )
                     delete tags[key];
                 else
index 87ff4cb4dd5c3323b2a4899aeaa75f9ab82b0005..8c7b32c5b79cc843e19933343f027904aae84f56 100644 (file)
@@ -131,17 +131,14 @@ package net.systemeD.potlatch2.controller {
                        } else if ( event.type == MouseEvent.MOUSE_DOWN ) {
                                if ( entity is Node && selectedWay && entity.hasParent(selectedWay) ) {
                                        // select node within this way
-                       return new DragWayNode(selectedWay,  getNodeIndex(selectedWay,entity as Node),  event, false);
-                               } else if ( entity is Node && focus is Way ) {
-                                       // select way node
-                                       return new DragWayNode(focus as Way, getNodeIndex(focus as Way,entity as Node), event, false);
+                                       return new DragWayNode(selectedWay,  getNodeIndex(selectedWay,entity as Node),  event, false);
                                } else if ( controller.keyDown(Keyboard.SPACE) ) {
                                        // drag the background imagery to compensate for poor alignment
                                        return new DragBackground(event);
                                } else if (entity && selection.indexOf(entity)>-1) {
                                        return new DragSelection(selection, event);
                                } else if (entity) {
-                                       return new DragSelection([entity], event);
+                                       return controller.findStateForSelection([entity]);
                                } else if (event.ctrlKey && !layer.isBackground) {
                                        return new SelectArea(event.localX,event.localY,selection);
                                }
index 1faf0bb27d9c7f18822e26ed326a3d827f73e215..887aa9947936b16a51252d79816dcfe8f7a8397a 100644 (file)
@@ -76,8 +76,7 @@
         }
         
         private function goToSelected():void {
-            FlexGlobals.topLevelApplication.theMap.updateCoordsFromLatLon(selectedResult.lat, selectedResult.lon);
-            FlexGlobals.topLevelApplication.theMap.download();
+            FlexGlobals.topLevelApplication.theMap.moveMapFromLatLon(selectedResult.lat, selectedResult.lon);
             //FlexGlobals.topLevelApplication.theMap.redraw();
             PopUpManager.removePopUp(this);
         }
index ba14534c1d7e836cb99b0714f0b2d5fe22f5f3d8..edf3a33968b5b5a72efafc505620b00d0d54c1ce 100644 (file)
     </fx:Declarations>
 
     <mx:ApplicationControlBar id="controlbar" dock="true">
+        <mx:Button label="Save" icon="@Embed('embedded/upload.svg')" disabledIcon="@Embed('embedded/upload_disabled.svg')" styleName="appBarButton"
+                       click="SaveManager.saveChanges(theMap.editableLayer.connection);" id="saveButton" enabled="false"/>
+        <mx:Button id="helpButton" label="Help" click="new HelpDialog().init();" styleName="appBarButton" />
+        <mx:Spacer width="40"/>
+        <mx:Button id="undo" label="Undo" click="MainUndoStack.getGlobalStack().undo();" styleName="appBarButton"
+            enabled="{MainUndoStack.getGlobalStack().canUndo()}"
+            toolTip="{MainUndoStack.getGlobalStack().getUndoDescription() ? 'Undo '+MainUndoStack.getGlobalStack().getUndoDescription() : 'Undo last action'}" />
+        <mx:Button id="redo" label="Redo" click="MainUndoStack.getGlobalStack().redo();" styleName="appBarButton"
+            enabled="{MainUndoStack.getGlobalStack().canRedo()}"
+            toolTip="{MainUndoStack.getGlobalStack().getRedoDescription() ? 'Redo '+MainUndoStack.getGlobalStack().getRedoDescription() : 'Redo last action'}" />
+        <mx:Spacer width="100%"/>
         <mx:PopUpButton id="bgButton" label="Background" openAlways="true" styleName="appBarButton"
             creationComplete="bgButton.popUp = new BackgroundSelector();"/>
         <mx:PopUpButton id="styleButton" label="Map Style" openAlways="true" styleName="appBarButton"
                                </fx:Array>
                        </mx:dataProvider>
                </mx:PopUpMenuButton>
-        <mx:Spacer width="100%"/>
-        <mx:Button id="undo" label="Undo" click="MainUndoStack.getGlobalStack().undo();" styleName="appBarButton"
-            enabled="{MainUndoStack.getGlobalStack().canUndo()}"
-            toolTip="{MainUndoStack.getGlobalStack().getUndoDescription() ? 'Undo '+MainUndoStack.getGlobalStack().getUndoDescription() : 'Undo last action'}" />
-        <mx:Button id="redo" label="Redo" click="MainUndoStack.getGlobalStack().redo();" styleName="appBarButton"
-            enabled="{MainUndoStack.getGlobalStack().canRedo()}"
-            toolTip="{MainUndoStack.getGlobalStack().getRedoDescription() ? 'Redo '+MainUndoStack.getGlobalStack().getRedoDescription() : 'Redo last action'}" />
-        <mx:Spacer width="100%"/>
-        <mx:Button id="helpButton" label="Help" click="new HelpDialog().init();" styleName="appBarButton" />
         <mx:Button id="optionsButton" label="Options" click="new OptionsDialog().init();" styleName="appBarButton" />
-        <mx:Button label="Save" icon="@Embed('embedded/upload.svg')" disabledIcon="@Embed('embedded/upload_disabled.svg')" styleName="appBarButton"
-                       click="SaveManager.saveChanges(theMap.editableLayer.connection);" id="saveButton" enabled="false"/>
     </mx:ApplicationControlBar>
     
     <mx:HDividedBox width="100%" height="100%">
         }
 
         private function loadTrace(id:Number):void {
-            var conn:Connection = theMap.editableLayer.connection;
-            conn.addEventListener(Connection.TRACES_LOADED, function (e:Event):void {
-                for each (var trace:Trace in conn.getTraces()) {
-                    if (trace.id == id) { trace.addToMap(); }
-                }
-            });
-            conn.fetchUserTraces();
+                       var conn:Connection = theMap.editableLayer.connection;
+                       conn.addEventListener(Connection.TRACES_LOADED, function (e:Event):void {
+                               var t:Trace = conn.findTrace(id);
+                               if (!t) { t=new Trace(conn,id); conn.addTrace(t); }
+                               t.addToMap();
+                               conn.removeEventListener(Connection.TRACES_LOADED, arguments.callee);
+                       });
+                       conn.fetchUserTraces();
         }
 
        ]]></fx:Script>
index 103330189d29a3a220a4a68062f07de933e1a882..b6722e535e93bd43d42eb693c03348db333fc12c 100644 (file)
                <url>http://cube.telascience.org/tilecache/tilecache.py/1.0.0/NAIP_ALL/$z/$x/$y.png</url>
                <sourcetag>NAIP</sourcetag>
        </set>
-    <set minlat="54.44" minlon="7.81" maxlat="57.86" maxlon="15.49">
-        <name>Denmark - Fugro Aerial Imagery</name>
-        <url>http://fugro.findvej.dk/fugro2005/$z/$x/$y.jpg</url>
-        <sourcetag>Fugro (2005)</sourcetag>
+       <set minlat="54.44" minlon="7.81" maxlat="57.86" maxlon="15.49">
+               <name>Denmark - Fugro Aerial Imagery</name>
+               <url>http://tile.openstreetmap.dk/fugro2005/$z/$x/$y.jpg</url>
+               <sourcetag>Fugro (2005)</sourcetag>
+       </set>
+       <set minlat="55.23403" minlon="12.09144" maxlat="55.43647" maxlon="12.47712">
+               <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>
index a353e37b76a5d5485fb965eeacbb736c743922b2..f095821ea75a42a899b6b826cb02ef1778303535 100644 (file)
     <input type="freetext" presence="always" name="Reference number" key="ref" description="A reference number or code used to identify this thing." />
   </inputSet>
 
+   <inputSet id="simpleBrand"> 
+     <input type="freetext" category="Naming" presence="always" name="Brand" key="brand" description="Brand, i.e. Acme"/> 
+   </inputSet> 
+  
+   <inputSet id="simpleOperator"> 
+     <input type="freetext" category="Naming" presence="always" name="Operator" key="operator" description="Operator, i.e. Acme Springfield Ltd"/> 
+   </inputSet> 
 
   <inputSet id="source">
     <input type="freetext" category="Details" presence="onTagMatch" name="Source" key="source" description="The primary source of information for this object (GPS, survey, Yahoo, ...)" priority="lowest"/>
     <input type="choice" name="Electrified" category="Details" subcategory="Electrification" description="Is the track electrified (whether by 3rd rail, overhead wires, etc)?"
            key="electrified">
       <choice value="yes" text="Yes"/>
+      <choice value="contact_line" text="Overhead line"/>
+      <choice value="rail" text="Third rail"/>
       <choice value="no" text="No"/>
     </input>
     <input type="choice" name="Voltage" category="Details" subcategory="Electrification" description="Nominal voltage of electric wires"
     </input>
   </inputSet>
 
+  <inputSet id="pitchSport">
+    <input name="Sport" presence="always" category="Sport" key="sport" type="choice" description="The sport that is predominantly played here.">
+      <choice value="9pin" text="9 pin bowling"/>
+      <choice value="10pin" text="10 pin bowling"/>
+      <choice value="american_football" text="American football"/>
+      <choice value="archery" text="Archery"/>
+      <choice value="athletics" text="Athletics"/>
+      <choice value="australian_football" text="Australian Rules Football"/>
+      <choice value="baseball" text="Baseball"/>
+      <choice value="basketball" text="Basketball"/>
+      <choice value="beachvolleyball" text="Beach volleyball"/>
+      <choice value="boules" text="Boules/petanque/bocci"/>
+      <choice value="bowls" text="Lawn bowls"/>
+      <choice value="canadian_football" text="Canadian football"/>
+      <choice value="chess" text="Chess"/>
+      <choice value="cricket" text="Cricket"/>
+      <choice value="cricket_nets" text="Cricket nets"/>
+      <choice value="croquet" text="Croquet"/>
+      <choice value="equestrian" text="Equestrian"/>
+      <choice value="gaelic_football" text="Gaelic football"/>
+      <choice value="gymnastics" text="Gymnastics"/>
+      <choice value="team_handball" text="(Team) handball"/>
+      <choice value="hockey" text="(Field) hockey"/>
+      <choice value="korfball" text="Korfball"/>
+      <choice value="pelota" text="Pelota"/>
+      <choice value="rugby_league" text="Rugby league"/>
+      <choice value="rugby_union" text="Rugby union"/>
+      <choice value="shooting" text="Shooting"/>
+      <choice value="skating" text="Ice skating"/>
+      <choice value="skateboard" text="Skateboarding"/>
+      <choice value="soccer" text="Soccer/football"/>
+      <choice value="swimming" text="Swimming"/>
+      <choice value="table_tennis" text="Table tennis"/>
+      <choice value="tennis" text="Tennis"/>
+      <choice value="volleyball" text="Volleyball"/>
+    </input>
+  </inputSet>
+
+  <inputSet id="pitchSport">
+    <input name="Sport" presence="always" category="Details" key="sport" type="choice" description="The sport that is predominantly played here.">
+      <choice value="9pin" text="9 pin bowling"/>
+      <choice value="10pin" text="10 pin bowling"/>
+      <choice value="american_football" text="American football"/>
+      <choice value="archery" text="Archery"/>
+      <choice value="athletics" text="Athletics"/>
+      <choice value="australian_football" text="Australian Rules Football"/>
+      <choice value="baseball" text="Baseball"/>
+      <choice value="basketball" text="Basketball"/>
+      <choice value="beachvolleyball" text="Beach volleyball"/>
+      <choice value="boules" text="Boules/petanque/bocci"/>
+      <choice value="bowls" text="Lawn bowls"/>
+      <choice value="canadian_football" text="Canadian football"/>
+      <choice value="chess" text="Chess"/>
+      <choice value="cricket" text="Cricket"/>
+      <choice value="cricket_nets" text="Cricket nets"/>
+      <choice value="croquet" text="Croquet"/>
+      <choice value="equestrian" text="Equestrian"/>
+      <choice value="gaelic_football" text="Gaelic football"/>
+      <choice value="gymnastics" text="Gymnastics"/>
+      <choice value="team_handball" text="(Team) handball"/>
+      <choice value="hockey" text="(Field) hockey"/>
+      <choice value="korfball" text="Korball"/>
+      <choice value="pelota" text="Pelota"/>
+      <choice value="rugby_league" text="Rugby league"/>
+      <choice value="rugby_union" text="Rugby union"/>
+      <choice value="shooting" text="Shooting"/>
+      <choice value="skating" text="Ice skating"/>
+      <choice value="skateboard" text="Skateboarding"/>
+      <choice value="soccer" text="Soccer/football"/>
+      <choice value="swimming" text="Swimming"/>
+      <choice value="table_tennis" text="Table tennis"/>
+      <choice value="tennis" text="Tennis"/>
+      <choice value="volleyball" text="Volleyball"/>
+    </input>
+  </inputSet>
 
 <!-- Features -->
 
index bb540744a7e16ed725fe2ec6cc923cb2dade9c57..0f249f5186649215589a7e28db88b05d66d6dc1b 100644 (file)
     <icon image="features/pois/amenity_recycling.n.24.png"/>
     <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Drecycling</help>
     <point/>
+    <area/>
     <tag k="amenity" v="recycling"/>
+    <inputSet ref="simpleName"/>
+    <input type="choice" presence="always" category="Details" name="Type of facility" key="recycling_type" description="Is this containers in a rural area or at an manned facility?" priority="high">
+      <choice value="container" text="Container"/>
+      <choice value="centre" text="Recycling centre"/>
+    </input>
+    <input type="choice" presence="onTagMatch" category="Details" name="Batteries" key="recycling:batteries" description="Small batteries for household appliances" priority="low">
+      <choice value="yes" text="Yes"/>
+      <choice value="no" text="No"/>
+    </input>
+    <input type="choice" presence="onTagMatch" category="Details" name="Books" key="recycling:books" description="" priority="low">
+      <choice value="yes" text="Yes"/>
+      <choice value="no" text="No"/>
+    </input>
+    <input type="choice" presence="onTagMatch" category="Details" name="Cans" key="recycling:cans" description="Metal cans and other small metal packaging" priority="low">
+      <choice value="yes" text="Yes"/>
+      <choice value="no" text="No"/>
+    </input>
+    <input type="choice" presence="onTagMatch" category="Details" name="Cardboard" key="recycling:cardboard" description="I.e. large pieces of packaging" priority="low">
+      <choice value="yes" text="Yes"/>
+      <choice value="no" text="No"/>
+    </input>
+    <input type="choice" presence="onTagMatch" category="Details" name="Cartons" key="recycling:cartons" description="Packaging for groceries, i.e. milk cartons" priority="low">
+      <choice value="yes" text="Yes"/>
+      <choice value="no" text="No"/>
+    </input>
+    <input type="choice" presence="onTagMatch" category="Details" name="Clothes" key="recycling:clothes" description="Clothes, including shoes" priority="low">
+      <choice value="yes" text="Yes"/>
+      <choice value="no" text="No"/>
+    </input>
+    <input type="choice" presence="onTagMatch" category="Details" name="Electrical appliances" key="recycling:electrical_appliances" description="Larger electrical items, i.e. refrigerators, freezers, dishwashers" priority="low">
+      <choice value="yes" text="Yes"/>
+      <choice value="no" text="No"/>
+    </input>
+    <input type="choice" presence="onTagMatch" category="Details" name="Glass" key="recycling:glass" description="I.e glass sheets" priority="low">
+      <choice value="yes" text="Yes"/>
+      <choice value="no" text="No"/>
+    </input>
+    <input type="choice" presence="onTagMatch" category="Details" name="Glass bottles" key="recycling:glass_bottles" description="" priority="low">
+      <choice value="yes" text="Yes"/>
+      <choice value="no" text="No"/>
+    </input>
+    <input type="choice" presence="onTagMatch" category="Details" name="Green waste" key="recycling:green_waste" description="" priority="low">
+      <choice value="yes" text="Yes"/>
+      <choice value="no" text="No"/>
+    </input>
+    <input type="choice" presence="onTagMatch" category="Details" name="Magazines" key="recycling:magazines" description="Magazines (glossy pages)" priority="low">
+      <choice value="yes" text="Yes"/>
+      <choice value="no" text="No"/>
+    </input>
+    <input type="choice" presence="onTagMatch" category="Details" name="Newspaper" key="recycling:newspaper" description="" priority="low">
+      <choice value="yes" text="Yes"/>
+      <choice value="no" text="No"/>
+    </input>
+    <input type="choice" presence="onTagMatch" category="Details" name="Paper" key="recycling:paper" description="" priority="low">
+      <choice value="yes" text="Yes"/>
+      <choice value="no" text="No"/>
+    </input>
+    <input type="choice" presence="onTagMatch" category="Details" name="Paper packaging" key="recycling:paper_packaging" description="" priority="low">
+      <choice value="yes" text="Yes"/>
+      <choice value="no" text="No"/>
+    </input>
+    <input type="choice" presence="onTagMatch" category="Details" name="Plastic" key="recycling:plastic" description="" priority="low">
+      <choice value="yes" text="Yes"/>
+      <choice value="no" text="No"/>
+    </input>
+    <input type="choice" presence="onTagMatch" category="Details" name="Plastic bottles" key="recycling:plastic_bottles" description="" priority="low">
+      <choice value="yes" text="Yes"/>
+      <choice value="no" text="No"/>
+    </input>
+    <input type="choice" presence="onTagMatch" category="Details" name="Plastic packaging" key="recycling:plastic_packaging" description="" priority="low">
+      <choice value="yes" text="Yes"/>
+      <choice value="no" text="No"/>
+    </input>
+    <input type="choice" presence="onTagMatch" category="Details" name="Scrap metal" key="recycling:scrap_metal" description="" priority="low">
+      <choice value="yes" text="Yes"/>
+      <choice value="no" text="No"/>
+    </input>
+    <input type="choice" presence="onTagMatch" category="Details" name="Small appliances" key="recycling:small_appliances" description="Small electrical appliances, i.e. walkman, power adapter, remote control" priority="low">
+      <choice value="yes" text="Yes"/>
+      <choice value="no" text="No"/>
+    </input>
+    <input type="choice" presence="onTagMatch" category="Details" name="Waste" key="recycling:waste" description="General waste (black bags)" priority="low">
+      <choice value="yes" text="Yes"/>
+      <choice value="no" text="No"/>
+    </input>
+    <input type="choice" presence="onTagMatch" category="Details" name="Wood" key="recycling:wood" description="" priority="low">
+      <choice value="yes" text="Yes"/>
+      <choice value="no" text="No"/>
+    </input>
     <inputSet ref="common"/>
   </feature>
 
-
   <feature name="School">
     <category>amenity</category>
     <icon image="features/pois/education_school.n.24.png">
     <input type="freetext" presence="always" category="Details" name="Ref" key="ref" description="Reference number of the post office"/>
     <input type="freetext" presence="always" category="Details" name="Operator" key="operator" description="The provider of the postal service" priority="low"/>
     <inputSet ref="common"/>
-    <inputset ref="simpleName"/>
+    <inputSet ref="simpleName"/>
   </feature>
 
   <feature name="Trash/rubbish bin">
     <point/>
     <area/>
     <tag k="amenity" v="shelter"/>
+      <input type="choice" presence="always" name="Type of shelter" key="shelter_type" description="The intended use of the shelter.">
+        <choice value="picnic_shelter" text="Picnic shelter"/>
+        <choice value="public_transport" text="Public transport"/>
+        <choice value="weather_shelter" text="Weather shelter"/>
+        <choice value="wildlife_hide" text="Wildlife hide"/>
+      </input>
     <inputset ref="names"/>
     <inputSet ref="common"/>
   </feature>
     <inputSet ref="common"/>
     <inputSet ref="simpleName"/>
     <input type="freetext" presence="always" name="Product" key="vending" description="What is being sold: tickets, food, maps..."/>
-    <input type="operator" presence="always" name="Operator" key="operator" description="Which company provides the service" />
+    <inputSet ref="simpleOperator" />
   </feature>
 
   <!-- ========= Entertainment ========= -->
index f7e956d2c9fed04d075f245ff56a7736d899a8dc..916de11eb9c701926274e8ac45e639214ad394fe 100644 (file)
 
     <point/>
     <tag k="barrier" v="toll_booth"/>
-    <tagSet ref="fee"/>
+    <inputSet ref="fee"/>
     <input type="freetext" presence="onTagMatch" category="Details" name="Operator" key="operator" description="The provider of the toll" priority="low"/>
     <inputSet ref="common"/>
   </feature>
index b3b6a9da1f78f1dd0a12f3f73198535debba0cfd..09b921f8e68dd7ff38c503382332fb6fdb647adf 100644 (file)
     <inputSet ref="common"/>
   </feature>
 
-
-  <inputSet id="pitchSport">
-    <input name="Sport" presence="always" category="Details" key="sport" type="choice" description="The sport that is predominantly played here.">
-      <choice value="9pin" text="9 pin bowling"/>
-      <choice value="10pin" text="10 pin bowling"/>
-      <choice value="american_football" text="American football"/>
-      <choice value="archery" text="Archery"/>
-      <choice value="athletics" text="Athletics"/>
-      <choice value="australian_football" text="Australian Rules Football"/>
-      <choice value="baseball" text="Baseball"/>
-      <choice value="basketball" text="Basketball"/>
-      <choice value="beachvolleyball" text="Beach volleyball"/>
-      <choice value="boules" text="Boules/petanque/bocci"/>
-      <choice value="bowls" text="Lawn bowls"/>
-      <choice value="canadian_football" text="Canadian football"/>
-      <choice value="chess" text="Chess"/>
-      <choice value="cricket" text="Cricket"/>
-      <choice value="cricket_nets" text="Cricket nets"/>
-      <choice value="croquet" text="Croquet"/>
-      <choice value="equestrian" text="Equestrian"/>
-      <choice value="gaelic_football" text="Gaelic football"/>
-      <choice value="gymnastics" text="Gymnastics"/>
-      <choice value="team_handball" text="(Team) handball"/>
-      <choice value="hockey" text="(Field) hockey"/>
-      <choice value="korfball" text="Korball"/>
-      <choice value="pelota" text="Pelota"/>
-      <choice value="rugby_league" text="Rugby league"/>
-      <choice value="rugby_union" text="Rugby union"/>
-      <choice value="shooting" text="Shooting"/>
-      <choice value="skating" text="Ice skating"/>
-      <choice value="skateboard" text="Skateboarding"/>
-      <choice value="soccer" text="Soccer/football"/>
-      <choice value="swimming" text="Swimming"/>
-      <choice value="table_tennis" text="Table tennis"/>
-      <choice value="tennis" text="Tennis"/>
-      <choice value="volleyball" text="Volleyball"/>
-    </input>
-  </inputSet>
-
   <feature name="Sports track">
     <category>sport</category>
     <area/>
     <tag k="landuse" v="meadow"/>
     <inputSet ref="common"/>
   </feature>
-
-
 </featureGroup>
\ No newline at end of file
index 55e3fc4118e6be2162dc93a4bc6e9fc25e5f55cf..52db9362c7e0015c16d283170be9cdf2ad6ebbde 100644 (file)
@@ -1,65 +1,65 @@
-<featureGroup>\r
-  <feature name="Tower/mast">\r
-    <category>manmade</category>\r
-    <icon image="features/manmade_tower.png"/>\r
-    <point/>\r
-    <tag k="man_made" v="tower" vmatch="tower|water_tower|lighthouse|chimney|mast|communications_tower|flagpole|antenna|pole|cross"/>\r
-    <input type="choice" key="man_made" name="Object" presence="always" priority="highest">\r
-      <choice value="tower" text="Tower"/>\r
-      <choice value="water_tower" text="Water tower"/>\r
-      <choice value="lookout_tower" text="Lookout tower"/>\r
-      <choice value="lighthouse" text="Lighthouse"/>\r
-      <choice value="chimney" text="Chimney"/>\r
-      <choice value="mast" text="Mast"/>\r
-      <choice value="flagpole" text="Flagpole"/>\r
-      <choice value="pole" text="Pole"/>\r
-      <choice value="cross" text="Cross"/>\r
-      <choice value="communications_tower" text="Comm. tower"/>\r
-      <choice value="communications_transponder" text="Comm. transponder"/>\r
-      <choice value="antenna" text="Antenna"/>\r
-    </input>\r
-    <inputSet ref="nameAndRef" />\r
-    <inputSet ref="common"/>\r
-  </feature>\r
-  \r
-  <feature name="Navigation mark">\r
-    <category>manmade</category>\r
-    <icon image="features/manmade_lighthouse.png"/>\r
-    <point/>\r
-    <tag k="man_made" v="survey_point" vmatch="survey_point|lighthouse|beacon|cairn|buoy"/>\r
-    <input type="choice" key="man_made" name="Object" presence="always" priority="highest">\r
-      <choice value="survey_point" text="Trig point"/>\r
-      <choice value="lighthouse" text="Lighthouse"/>\r
-      <choice value="beacon" text="Beacon"/>\r
-      <choice value="cairn" text="Cairn"/>\r
-      <choice value="buoy" text="Buoy"/>\r
-    </input>\r
-    <inputSet ref="nameAndRef" />\r
-    <inputSet ref="common"/>\r
-  </feature>\r
-\r
-\r
-  <feature name="Silo/tank">\r
-    <category>manmade</category>\r
-    <icon image="features/manmade_silo.png"/>\r
-    <point/>\r
-    <area/>\r
-    <tag k="man_made" v="silo" vmatch="silo|storage_tank|tank|oil_tank|water_tank|fuel_storage_tank|reservoir|reservoir_covered|gasometer|bladder"/>\r
-    <input type="choice" key="man_made" name="Object" presence="always" priority="highest">\r
-      <choice value="silo" text="Silo"/>\r
-      <choice value="storage_tank" text="Storage tank"/>\r
-      <choice value="tank" text="Tank"/>\r
-      <choice value="oil_tank" text="Oil tank"/>\r
-      <choice value="water_tank" text="Water tank"/>\r
-      <choice value="water_tower" text="Water tower"/> <!-- supported here but grouped under "tower/mast" -->\r
-      <choice value="fuel_storage_tank" text="Fuel storage tank"/>\r
-      <choice value="reservoir" text="Reservoir"/>\r
-      <choice value="reservoir_covered" text="Covered reservoir"/>\r
-      <choice value="gasometer" text="Gasometer"/>\r
-      <choice value="bladder" text="Bladder"/>\r
-    </input>\r
-    <inputSet ref="nameAndRef" />\r
-    <inputSet ref="common"/>\r
-  </feature>\r
-</featureGroup>  \r
-\r
+<featureGroup>
+  <feature name="Tower/mast">
+    <category>manmade</category>
+    <icon image="features/manmade_tower.png"/>
+    <point/>
+    <tag k="man_made" v="tower" vmatch="tower|water_tower|lighthouse|chimney|mast|communications_tower|flagpole|antenna|pole|cross"/>
+    <input type="choice" key="man_made" name="Object" presence="always" priority="highest">
+      <choice value="tower" text="Tower"/>
+      <choice value="water_tower" text="Water tower"/>
+      <choice value="lookout_tower" text="Lookout tower"/>
+      <choice value="lighthouse" text="Lighthouse"/>
+      <choice value="chimney" text="Chimney"/>
+      <choice value="mast" text="Mast"/>
+      <choice value="flagpole" text="Flagpole"/>
+      <choice value="pole" text="Pole"/>
+      <choice value="cross" text="Cross"/>
+      <choice value="communications_tower" text="Comm. tower"/>
+      <choice value="communications_transponder" text="Comm. transponder"/>
+      <choice value="antenna" text="Antenna"/>
+    </input>
+    <inputSet ref="nameAndRef" />
+    <inputSet ref="common"/>
+  </feature>
+  
+  <feature name="Navigation mark">
+    <category>manmade</category>
+    <icon image="features/manmade_lighthouse.png"/>
+    <point/>
+    <tag k="man_made" v="survey_point" vmatch="survey_point|lighthouse|beacon|cairn|buoy"/>
+    <input type="choice" key="man_made" name="Object" presence="always" priority="highest">
+      <choice value="survey_point" text="Trig point"/>
+      <choice value="lighthouse" text="Lighthouse"/>
+      <choice value="beacon" text="Beacon"/>
+      <choice value="cairn" text="Cairn"/>
+      <choice value="buoy" text="Buoy"/>
+    </input>
+    <inputSet ref="nameAndRef" />
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Silo/tank">
+    <category>manmade</category>
+    <icon image="features/manmade_silo.png"/>
+    <point/>
+    <area/>
+    <tag k="man_made" v="silo" vmatch="silo|storage_tank|tank|oil_tank|water_tank|fuel_storage_tank|reservoir|reservoir_covered|gasometer|bladder"/>
+    <input type="choice" key="man_made" name="Object" presence="always" priority="highest">
+      <choice value="silo" text="Silo"/>
+      <choice value="storage_tank" text="Storage tank"/>
+      <choice value="tank" text="Tank"/>
+      <choice value="oil_tank" text="Oil tank"/>
+      <choice value="water_tank" text="Water tank"/>
+      <choice value="water_tower" text="Water tower"/> <!-- supported here but grouped under "tower/mast" -->
+      <choice value="fuel_storage_tank" text="Fuel storage tank"/>
+      <choice value="reservoir" text="Reservoir"/>
+      <choice value="reservoir_covered" text="Covered reservoir"/>
+      <choice value="gasometer" text="Gasometer"/>
+      <choice value="bladder" text="Bladder"/>
+    </input>
+    <inputSet ref="nameAndRef" />
+    <inputSet ref="common"/>
+  </feature>
+</featureGroup>  
+
index 11cf80d955bfeb92f57cac51017b65e79458f185..b737f1637117e700468602e0ce6ffe8967112a70 100644 (file)
@@ -9,7 +9,6 @@
     <tag k="highway" v="footway"/>
     <inputSet ref="path"/>
     <inputSet ref="common"/>
-    <inputset ref="naming"/>
   </feature>
 
   <feature name="Cycle path">
     <tag k="highway" v="cycleway"/>
     <inputSet ref="path"/>
     <inputSet ref="common"/>
-    <inputset ref="naming"/>
-    <input type="choice"
-        name="Cycleway type" category="Cycle" description="What kind of bike path is this?"
-        key="cycleway" presence="onTagMatch" priority="low">
-        <choice value="segregated" text="Segregated" description="Cyclists and pedestrians are separated by a painted line or kerb."/>
-        <choice value="shared" text="Shared" description="Cyclists and pedestrians share the full width of the path."/>
-    </input> 
+    <input type="choice" name="Cycleway type" category="Cycle" description="What kind of bike path is this?" key="segregated" presence="onTagMatch" priority="low">
+      <choice value="yes" text="Segregated" description="Cyclists and pedestrians are separated by a painted line or kerb." />
+      <choice value="no" text="Shared" description="Cyclists and pedestrians share the full width of the path." />
+    </input>
   </feature>
 
   <feature name="Pedestrian street">
@@ -51,7 +47,6 @@
     </area>
     <inputSet ref="minorRoad"/>
     <inputSet ref="common"/>
-    <inputset ref="naming"/>
   </feature>
 
   <feature name="Bridleway">
@@ -63,7 +58,6 @@
     <tag k="highway" v="bridleway"/>
     <inputSet ref="path"/>
     <inputSet ref="common"/>
-    <inputset ref="naming"/>
   </feature>
 
   <feature name="Steps">
@@ -90,7 +84,6 @@
     <tag k="highway" v="path"/>
     <inputSet ref="path"/>
     <inputSet ref="common"/>
-    <inputset ref="naming"/>
   </feature>
 
   
     <inputSet ref="common"/>
   </feature>
   
-</featureGroup>
\ No newline at end of file
+</featureGroup>
index 811aa7ced4c8a4a95924814eb4349bfe228e4ad1..0beea237798058b2f495fdbe489a65ae0f50b37e 100644 (file)
-<featureGroup>\r
-  <feature name="Hamlet">\r
-    <category>places</category>\r
-    <icon image="features/pois/poi_place_hamlet.p.24.png"/>\r
-    <point/>\r
-    <area/>\r
-    <tag k="place" v="hamlet" />\r
-    <inputSet ref="names"/>\r
-    <inputSet ref="places"/>\r
-    <inputSet ref="common"/>\r
-  </feature>\r
-\r
-  <feature name="Village">\r
-    <category>places</category>\r
-    <icon image="features/pois/poi_place_village.p.24.png"/>\r
-    <point/>\r
-    <area/>\r
-    <tag k="place" v="village" />\r
-    <inputSet ref="names"/>\r
-    <inputSet ref="places"/>\r
-    <inputSet ref="common"/>\r
-  </feature>\r
-\r
-  <feature name="Town">\r
-    <category>places</category>\r
-    <icon image="features/pois/poi_place_town.p.24.png"/>\r
-    <point/>\r
-    <area/>\r
-    <tag k="place" v="town" />\r
-    <inputSet ref="names"/>\r
-    <inputSet ref="places"/>\r
-    <inputSet ref="common"/>\r
-  </feature>\r
-\r
-  <feature name="Suburb">\r
-    <category>places</category>\r
-    <icon image="features/pois/poi_place_suburb.p.24.png"/>\r
-    <point/>\r
-    <area/>\r
-    <tag k="place" v="suburb" />\r
-    <inputSet ref="names"/>\r
-    <inputSet ref="places"/>\r
-    <inputSet ref="common"/>\r
-  </feature>\r
-\r
-  <feature name="City">\r
-    <category>places</category>\r
-    <icon image="features/pois/poi_place_city.p.24.png"/>\r
-    <point/>\r
-    <area/>\r
-    <tag k="place" v="city" />\r
-    <inputSet ref="names"/>\r
-    <inputSet ref="places"/>\r
-    <inputSet ref="common"/>\r
-  </feature>\r
-  \r
-<!-- Top 10 boundaries in order of usage on taginfo.openstreetmap.de -->\r
-\r
-  <feature name="Admin Boundary">\r
-    <category>places</category>\r
-    <line/>\r
-    <icon image="features/pois/poi_boundary_administrative.n.24.png"/>\r
-    <help>http://wiki.openstreetmap.org/wiki/Tag:boundary=administrative</help>\r
-    <tag k="boundary" v="administrative"/>\r
-    <input type="number" minimum="2" maximum="10" presence="always" name="Admin Level" key="admin_level" description="The Administrative level" />\r
-    <inputSet ref="simpleName"/>\r
-    <inputSet ref="common"/>\r
-  </feature>\r
-\r
-  <feature name="National Park">\r
-    <category>places</category>\r
-    <category>natural</category>\r
-    <line/>\r
-    <help>http://wiki.openstreetmap.org/wiki/Tag:boundary=national_park</help>\r
-    <tag k="boundary" v="national_park"/>\r
-    <inputSet ref="simpleName"/>\r
-    <inputSet ref="common"/>\r
-  </feature>\r
-\r
-  <feature name="Protected Area">\r
-    <category>places</category>\r
-    <category>natural</category>\r
-    <line/>\r
-    <help>http://wiki.openstreetmap.org/wiki/Tag:boundary=protected_area</help>\r
-    <tag k="boundary" v="protected_area"/>\r
-    <inputSet ref="simpleName"/>\r
-    <inputSet ref="common"/>\r
-  </feature>\r
-\r
-  <feature name="Town boundary">\r
-    <category>places</category>\r
-    <line/>\r
-    <help>http://wiki.openstreetmap.org/wiki/Tag:boundary=town</help>\r
-    <tag k="boundary" v="town"/>\r
-    <inputSet ref="simpleName"/>\r
-    <inputSet ref="common"/>\r
-  </feature>\r
-\r
-  <!-- boundary=landuse goes here. no idea what it is.-->\r
-\r
-  <feature name="Census boundary">\r
-    <category>places</category>\r
-    <line/>\r
-    <help>http://wiki.openstreetmap.org/wiki/Tag:boundary=census</help>\r
-    <tag k="boundary" v="census"/>\r
-    <inputSet ref="simpleName"/>\r
-    <inputSet ref="common"/>\r
-  </feature>\r
-\r
-  <!-- next three are marker, postcode_area, administrative. all seem dubious -->\r
-  \r
-  \r
-  \r
+<featureGroup>
+  <feature name="Hamlet">
+    <category>places</category>
+    <icon image="features/pois/poi_place_hamlet.p.24.png"/>
+    <point/>
+    <area/>
+    <tag k="place" v="hamlet" />
+    <inputSet ref="names"/>
+    <inputSet ref="places"/>
+    <inputSet ref="common"/>
+  </feature>
+
+  <feature name="Village">
+    <category>places</category>
+    <icon image="features/pois/poi_place_village.p.24.png"/>
+    <point/>
+    <area/>
+    <tag k="place" v="village" />
+    <inputSet ref="names"/>
+    <inputSet ref="places"/>
+    <inputSet ref="common"/>
+  </feature>
+
+  <feature name="Town">
+    <category>places</category>
+    <icon image="features/pois/poi_place_town.p.24.png"/>
+    <point/>
+    <area/>
+    <tag k="place" v="town" />
+    <inputSet ref="names"/>
+    <inputSet ref="places"/>
+    <inputSet ref="common"/>
+  </feature>
+
+  <feature name="Suburb">
+    <category>places</category>
+    <icon image="features/pois/poi_place_suburb.p.24.png"/>
+    <point/>
+    <area/>
+    <tag k="place" v="suburb" />
+    <inputSet ref="names"/>
+    <inputSet ref="places"/>
+    <inputSet ref="common"/>
+  </feature>
+
+  <feature name="City">
+    <category>places</category>
+    <icon image="features/pois/poi_place_city.p.24.png"/>
+    <point/>
+    <area/>
+    <tag k="place" v="city" />
+    <inputSet ref="names"/>
+    <inputSet ref="places"/>
+    <inputSet ref="common"/>
+  </feature>
+  
+<!-- Top 10 boundaries in order of usage on taginfo.openstreetmap.de -->
+
+  <feature name="Admin Boundary">
+    <category>places</category>
+    <line/>
+    <icon image="features/pois/poi_boundary_administrative.n.24.png"/>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:boundary=administrative</help>
+    <tag k="boundary" v="administrative"/>
+    <input type="number" minimum="2" maximum="10" presence="always" name="Admin Level" key="admin_level" description="The Administrative level" />
+    <inputSet ref="simpleName"/>
+    <inputSet ref="common"/>
+  </feature>
+
+  <feature name="National Park">
+    <category>places</category>
+    <category>natural</category>
+    <line/>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:boundary=national_park</help>
+    <tag k="boundary" v="national_park"/>
+    <inputSet ref="simpleName"/>
+    <inputSet ref="common"/>
+  </feature>
+
+  <feature name="Protected Area">
+    <category>places</category>
+    <category>natural</category>
+    <line/>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:boundary=protected_area</help>
+    <tag k="boundary" v="protected_area"/>
+    <inputSet ref="simpleName"/>
+    <inputSet ref="common"/>
+  </feature>
+
+  <feature name="Town boundary">
+    <category>places</category>
+    <line/>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:boundary=town</help>
+    <tag k="boundary" v="town"/>
+    <inputSet ref="simpleName"/>
+    <inputSet ref="common"/>
+  </feature>
+
+  <!-- boundary=landuse goes here. no idea what it is.-->
+
+  <feature name="Census boundary">
+    <category>places</category>
+    <line/>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:boundary=census</help>
+    <tag k="boundary" v="census"/>
+    <inputSet ref="simpleName"/>
+    <inputSet ref="common"/>
+  </feature>
+
+  <!-- next three are marker, postcode_area, administrative. all seem dubious -->
+  
+  
+  
 </featureGroup>
\ No newline at end of file
index e807e186ed1ea47af6f22ac5c080dc0272f74ce6..1ad78ae1daea6eaeeb1e9283fcb12b61ee9bf0b5 100644 (file)
-<featureGroup>\r
-<!-- ========= Accommodation ========= -->\r
-  <feature name="Hotel">\r
-    <category>accommodation</category>\r
-    <icon image="features/pois/accommodation_hotel.n.24.png"/>\r
-    <help>http://wiki.openstreetmap.org/wiki/Tag:tourism%3Dhotel</help>\r
-    <point/>\r
-    <area/>\r
-    <tag k="tourism" v="hotel"/>\r
-    <inputSet ref="simpleName"/>\r
-    <inputSet ref="common"/>\r
-  </feature>\r
-\r
-\r
-  <feature name="Motel">\r
-    <category>accommodation</category>\r
-    <help>http://wiki.openstreetmap.org/wiki/Tag:tourism%3Dmotel</help>\r
-    <point/>\r
-    <area/>\r
-    <icon image="features/pois/accommodation_motel.n.24.png"/>\r
-    <tag k="tourism" v="motel"/>\r
-    <inputSet ref="simpleName"/>\r
-    <inputSet ref="common"/>\r
-  </feature>\r
-\r
-\r
-\r
-  <feature name="Hostel">\r
-    <category>accommodation</category>\r
-    <point/>\r
-    <area/>\r
-    <inputSet ref="simpleName"/>\r
-    <icon image="features/pois/accommodation_youth_hostel.n.24.png"/>\r
-    <tag k="tourism" v="hostel"/>\r
-    <inputSet ref="common"/>\r
-  </feature>\r
-\r
-\r
-  <!-- Note that tourism=bed_and_breakfast also gets some use. -->\r
-  <feature name="Guesthouse (B&amp;B)">\r
-    <category>accommodation</category>\r
-    <point/>\r
-    <area/>\r
-    <inputSet ref="simpleName"/>\r
-    <icon image="features/pois/accommodation_bed_and_breakfast.n.24.png"/>\r
-    <tag k="tourism" v="guest_house"/>\r
-    <inputSet ref="common"/>\r
-  </feature>\r
-\r
-\r
-  <feature name="Campsite">\r
-    <category>accommodation</category>\r
-    <point/>\r
-    <area/>\r
-    <inputSet ref="simpleName"/>\r
-    <icon image="features/pois/accommodation_camping.n.24.png"/>\r
-    <tag k="tourism" v="camp_site"/>\r
-    <inputSet ref="common"/>\r
-  </feature>\r
-\r
-\r
-  <feature name="Caravan park">\r
-    <category>accommodation</category>\r
-    <point/>\r
-    <area/>\r
-    <inputSet ref="simpleName"/>\r
-    <icon image="features/pois/accommodation_caravan_park.n.24.png"/>\r
-    <tag k="tourism" v="caravan_site"/>\r
-    <inputSet ref="common"/>\r
-  </feature>\r
-\r
-\r
-  <feature name="Alpine hut">\r
-    <category>accommodation</category>\r
-    <point/>\r
-    <area/>\r
-    <inputSet ref="simpleName"/>\r
-    <icon image="features/pois/accommodation_alpinehut.n.24.png"/>\r
-    <tag k="tourism" v="alpine_hut"/>\r
-    <inputSet ref="common"/>\r
-  </feature>\r
-\r
-\r
-  <feature name="Chalet">\r
-    <category>accommodation</category>\r
-    <icon image="features/pois/accommodation_chalet.n.24.png"/>\r
-    <point/>\r
-    <area/>\r
-    <inputSet ref="simpleName"/>\r
-    <tag k="tourism" v="chalet"/>\r
-    <inputSet ref="common"/>\r
-  </feature>\r
-\r
-\r
-\r
-  <!-- ========= Tourism ========= -->\r
-  <feature name="Attraction">\r
-    <category>tourism</category>\r
-    <icon image="features/pois/tourist_attraction.n.24.png">\r
-      <b>${name} ${addr:housename}</b><br/>\r
-      ${addr:housenumber} ${addr:street} ${addr:postcode}\r
-    </icon>\r
-\r
-    <area/>\r
-    <tag k="tourism" v="attraction"/>\r
-    <inputSet ref="names"/>\r
-    <inputSet ref="buildingAddress"/>\r
-    <inputSet ref="common"/>\r
-  </feature>\r
-\r
-  <feature name="Museum">\r
-    <category>tourism</category>\r
-    <icon image="features/pois/tourist_museum.n.24.png"/>\r
-    <help>http://wiki.openstreetmap.org/wiki/Tag:tourism%3Dmuseum</help>\r
-    <point/>\r
-    <area/>\r
-    <tag k="tourism" v="museum"/>\r
-    <inputSet ref="simpleName"/>\r
-    <inputSet ref="common"/>\r
-  </feature>\r
-\r
-\r
-  <feature name="Archaeological">\r
-    <category>tourism</category>\r
-    <point/>\r
-    <area/>\r
-    <inputSet ref="simpleName"/>\r
-    <icon image="features/pois/tourist_archaeological.n.24.png"/>\r
-    <tag k="historic" v="archaeological_site"/>\r
-    <inputSet ref="common"/>\r
-  </feature>\r
-\r
-\r
-  <feature name="Battlefield">\r
-    <category>tourism</category>\r
-    <point/>\r
-    <area/>\r
-    <inputSet ref="simpleName"/>\r
-    <icon image="features/pois/tourist_battlefield.n.24.png"/>\r
-    <tag k="historic" v="battlefield"/>\r
-    <inputSet ref="common"/>\r
-  </feature>\r
-\r
-\r
-  <feature name="Castle">\r
-    <category>tourism</category>\r
-    <point/>\r
-    <area/>\r
-    <inputSet ref="simpleName"/>\r
-    <icon image="features/pois/tourist_castle.n.24.png"/>\r
-    <tag k="historic" v="castle"/>\r
-    <inputSet ref="common"/>\r
-  </feature>\r
-\r
-\r
-  <feature name="Memorial">\r
-    <category>tourism</category>\r
-    <point/>\r
-    <inputSet ref="simpleName"/>\r
-    <icon image="features/pois/tourist_memorial.n.24.png"/>\r
-    <tag k="historic" v="memorial"/>\r
-    <inputSet ref="common"/>\r
-  </feature>\r
-\r
-\r
-  <feature name="Monument">\r
-    <category>tourism</category>\r
-    <point/>\r
-    <inputSet ref="simpleName"/>\r
-    <icon image="features/pois/tourist_monument.n.24.png"/>\r
-    <tag k="historic" v="monument"/>\r
-    <inputSet ref="common"/>\r
-  </feature>\r
-\r
-\r
-  <feature name="Picnic site">\r
-    <category>tourism</category>\r
-    <point/>\r
-    <inputSet ref="simpleName"/>\r
-    <icon image="features/pois/tourist_picnic.n.24.png"/>\r
-    <tag k="tourism" v="picnic_site"/>\r
-    <inputSet ref="common"/>\r
-  </feature>\r
-\r
-\r
-  <feature name="Ruins">\r
-    <category>tourism</category>\r
-    <point/>\r
-    <area/>\r
-    <inputSet ref="simpleName"/>\r
-    <icon image="features/pois/tourist_ruin.n.24.png"/>\r
-    <tag k="historic" v="ruins"/>\r
-    <inputSet ref="common"/>\r
-  </feature>\r
-\r
-\r
-  <feature name="Cinema">\r
-    <category>tourism</category>\r
-    <icon image="features/pois/tourist_cinema.n.24.png"/>\r
-    <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dcinema</help>\r
-    <point/>\r
-    <area/>\r
-    <tag k="amenity" v="cinema"/>\r
-    <inputSet ref="simpleName"/>\r
-    <inputSet ref="common"/>\r
-  </feature>\r
-\r
-\r
-  <feature name="Theatre">\r
-    <category>tourism</category>\r
-    <point/>\r
-    <area/>\r
-    <inputSet ref="simpleName"/>\r
-    <icon image="features/pois/tourist_theatre.n.24.png"/>\r
-    <tag k="amenity" v="theatre"/>\r
-    <inputSet ref="common"/>\r
-  </feature>\r
-\r
-\r
-  <feature name="Viewpoint">\r
-    <category>tourism</category>\r
-    <point/>\r
-    <inputSet ref="simpleName"/>\r
-    <icon image="features/pois/tourist_view_point.n.24.png"/>\r
-    <tag k="tourism" v="viewpoint"/>\r
-    <inputSet ref="common"/>\r
-  </feature>\r
-\r
-\r
-  <feature name="Zoo">\r
-    <category>tourism</category>\r
-    <point/>\r
-    <area/>\r
-    <icon image="features/pois/tourist_zoo.n.24.png"/>\r
-    <tag k="tourism" v="zoo"/>\r
-    <inputSet ref="simpleName"/>\r
-    <inputSet ref="common"/>\r
-  </feature>\r
-\r
-\r
-  <feature name="Information">\r
-    <category>tourism</category>\r
-    <icon image="features/pois/amenity_information.n.24.png"/>\r
-    <point/>\r
-    <tag k="tourism" v="information"/>\r
-    <inputSet ref="simpleName"/>\r
-    <inputSet ref="common"/>\r
-  </feature>\r
-\r
-\r
-  <feature name="Artwork">\r
-    <category>tourism</category>\r
-    <icon image="features/pois/tourist_art_gallery2.n.24.png"/>\r
-    <point/>\r
-    <inputSet ref="simpleName"/>\r
-    <tag k="tourism" v="artwork"/>\r
-    <inputSet ref="common"/>\r
-  </feature>\r
-\r
-\r
-\r
-  <feature name="Theme park">\r
-    <category>tourism</category>\r
-    <icon image="features/pois/tourist_theme_park.n.24.png"/>\r
-    <point/>\r
-    <area/>\r
-    <inputSet ref="simpleName"/>\r
-    <tag k="tourism" v="theme_park"/>\r
-    <inputSet ref="common"/>\r
-  </feature>\r
-</featureGroup>\r
+<featureGroup>
+<!-- ========= Accommodation ========= -->
+  <feature name="Hotel">
+    <category>accommodation</category>
+    <icon image="features/pois/accommodation_hotel.n.24.png"/>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:tourism%3Dhotel</help>
+    <point/>
+    <area/>
+    <tag k="tourism" v="hotel"/>
+    <inputSet ref="simpleName"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Motel">
+    <category>accommodation</category>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:tourism%3Dmotel</help>
+    <point/>
+    <area/>
+    <icon image="features/pois/accommodation_motel.n.24.png"/>
+    <tag k="tourism" v="motel"/>
+    <inputSet ref="simpleName"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+
+  <feature name="Hostel">
+    <category>accommodation</category>
+    <point/>
+    <area/>
+    <inputSet ref="simpleName"/>
+    <icon image="features/pois/accommodation_youth_hostel.n.24.png"/>
+    <tag k="tourism" v="hostel"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <!-- Note that tourism=bed_and_breakfast also gets some use. -->
+  <feature name="Guesthouse (B&amp;B)">
+    <category>accommodation</category>
+    <point/>
+    <area/>
+    <inputSet ref="simpleName"/>
+    <icon image="features/pois/accommodation_bed_and_breakfast.n.24.png"/>
+    <tag k="tourism" v="guest_house"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Campsite">
+    <category>accommodation</category>
+    <point/>
+    <area/>
+    <inputSet ref="simpleName"/>
+    <icon image="features/pois/accommodation_camping.n.24.png"/>
+    <tag k="tourism" v="camp_site"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Caravan park">
+    <category>accommodation</category>
+    <point/>
+    <area/>
+    <inputSet ref="simpleName"/>
+    <icon image="features/pois/accommodation_caravan_park.n.24.png"/>
+    <tag k="tourism" v="caravan_site"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Alpine hut">
+    <category>accommodation</category>
+    <point/>
+    <area/>
+    <inputSet ref="simpleName"/>
+    <icon image="features/pois/accommodation_alpinehut.n.24.png"/>
+    <tag k="tourism" v="alpine_hut"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Chalet">
+    <category>accommodation</category>
+    <icon image="features/pois/accommodation_chalet.n.24.png"/>
+    <point/>
+    <area/>
+    <inputSet ref="simpleName"/>
+    <tag k="tourism" v="chalet"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+
+  <!-- ========= Tourism ========= -->
+  <feature name="Attraction">
+    <category>tourism</category>
+    <icon image="features/pois/tourist_attraction.n.24.png">
+      <b>${name} ${addr:housename}</b><br/>
+      ${addr:housenumber} ${addr:street} ${addr:postcode}
+    </icon>
+
+    <area/>
+    <tag k="tourism" v="attraction"/>
+    <inputSet ref="names"/>
+    <inputSet ref="buildingAddress"/>
+    <inputSet ref="common"/>
+  </feature>
+
+  <feature name="Museum">
+    <category>tourism</category>
+    <icon image="features/pois/tourist_museum.n.24.png"/>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:tourism%3Dmuseum</help>
+    <point/>
+    <area/>
+    <tag k="tourism" v="museum"/>
+    <inputSet ref="simpleName"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Archaeological">
+    <category>tourism</category>
+    <point/>
+    <area/>
+    <inputSet ref="simpleName"/>
+    <icon image="features/pois/tourist_archaeological.n.24.png"/>
+    <tag k="historic" v="archaeological_site"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Battlefield">
+    <category>tourism</category>
+    <point/>
+    <area/>
+    <inputSet ref="simpleName"/>
+    <icon image="features/pois/tourist_battlefield.n.24.png"/>
+    <tag k="historic" v="battlefield"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Castle">
+    <category>tourism</category>
+    <point/>
+    <area/>
+    <inputSet ref="simpleName"/>
+    <icon image="features/pois/tourist_castle.n.24.png"/>
+    <tag k="historic" v="castle"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Memorial">
+    <category>tourism</category>
+    <point/>
+    <inputSet ref="simpleName"/>
+    <icon image="features/pois/tourist_memorial.n.24.png"/>
+    <tag k="historic" v="memorial"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Monument">
+    <category>tourism</category>
+    <point/>
+    <inputSet ref="simpleName"/>
+    <icon image="features/pois/tourist_monument.n.24.png"/>
+    <tag k="historic" v="monument"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Picnic site">
+    <category>tourism</category>
+    <point/>
+    <inputSet ref="simpleName"/>
+    <icon image="features/pois/tourist_picnic.n.24.png"/>
+    <tag k="tourism" v="picnic_site"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Ruins">
+    <category>tourism</category>
+    <point/>
+    <area/>
+    <inputSet ref="simpleName"/>
+    <icon image="features/pois/tourist_ruin.n.24.png"/>
+    <tag k="historic" v="ruins"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Cinema">
+    <category>tourism</category>
+    <icon image="features/pois/tourist_cinema.n.24.png"/>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dcinema</help>
+    <point/>
+    <area/>
+    <tag k="amenity" v="cinema"/>
+    <inputSet ref="simpleName"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Theatre">
+    <category>tourism</category>
+    <point/>
+    <area/>
+    <inputSet ref="simpleName"/>
+    <icon image="features/pois/tourist_theatre.n.24.png"/>
+    <tag k="amenity" v="theatre"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Viewpoint">
+    <category>tourism</category>
+    <point/>
+    <inputSet ref="simpleName"/>
+    <icon image="features/pois/tourist_view_point.n.24.png"/>
+    <tag k="tourism" v="viewpoint"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Zoo">
+    <category>tourism</category>
+    <point/>
+    <area/>
+    <icon image="features/pois/tourist_zoo.n.24.png"/>
+    <tag k="tourism" v="zoo"/>
+    <inputSet ref="simpleName"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Information">
+    <category>tourism</category>
+    <icon image="features/pois/amenity_information.n.24.png"/>
+    <point/>
+    <tag k="tourism" v="information"/>
+    <inputSet ref="simpleName"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Artwork">
+    <category>tourism</category>
+    <icon image="features/pois/tourist_art_gallery2.n.24.png"/>
+    <point/>
+    <inputSet ref="simpleName"/>
+    <tag k="tourism" v="artwork"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+
+  <feature name="Theme park">
+    <category>tourism</category>
+    <icon image="features/pois/tourist_theme_park.n.24.png"/>
+    <point/>
+    <area/>
+    <inputSet ref="simpleName"/>
+    <tag k="tourism" v="theme_park"/>
+    <inputSet ref="common"/>
+  </feature>
+</featureGroup>
index d1c9c96e4cac3f17fa51c445f992ec6eb2152e1d..027f3b1f60367b9083788435b24fb4c26ba95a04 100644 (file)
@@ -97,7 +97,7 @@
         <tag k="railway" v="light_rail"/>
         <inputSet ref="bridge"/>
         <inputSet ref="tunnel"/>
-        <inputset ref="embankment-cutting"/>
+        <inputSet ref="embankment-cutting"/>
         <inputSet ref="rail-electrification"/>
         <inputSet ref="common"/>
       </feature>
         <input ref="tram-route"/>
         <inputSet ref="bridge"/>
         <inputSet ref="tunnel"/>
-        <inputset ref="embankment-cutting"/>
+        <inputSet ref="embankment-cutting"/>
         <inputSet ref="rail-electrification"/>
         <inputSet ref="common"/>
       </feature>
         <tag k="railway" v="subway"/>
         <inputSet ref="bridge"/>
         <inputSet ref="tunnel"/>
-        <inputset ref="embankment-cutting"/>
+        <inputSet ref="embankment-cutting"/>
         <inputSet ref="rail-electrification"/>
         <inputSet ref="common"/>
       </feature>
 
   <feature name="Fuel">
     <category>transport</category>
-    <point/>
-    <inputSet ref="simpleName"/>
-    <icon image="features/pois/transport_fuel.n.24.png"/>
+    <point />
+    <inputSet ref="simpleName" />
+    <icon image="features/pois/transport_fuel.n.24.png" />
     <tag k="amenity" v="fuel"/>
-    <input type="freetext" category="Details" name="Operator" key="operator" description="The provider of the service"/>
-    <input type="choice" category="Details" name="Diesel" key="diesel" description="Is diesel fuel sold here?">
+    <inputSet ref="simpleBrand"/>
+    <inputSet ref="simpleOperator"/>
+
+    <input type="choice" category="Details" name="Diesel" key="fuel:diesel" description="Is diesel fuel sold here?" priority="low">
       <choice value="yes" text="Yes"/>
       <choice value="no" text="No"/>
     </input>
-    <input type="choice" category="Details" name="Octane 91" key="diesel" description="Is octane 91 unleaded fuel sold here?">
+    <input type="choice" category="Details" name="GTL Diesel" key="fuel:GTL_diesel" description="Is GTL diesel fuel sold here?" priority="low">
       <choice value="yes" text="Yes"/>
       <choice value="no" text="No"/>
     </input>
-    <input type="choice" category="Details" name="Octane 95" key="octane_95" description="Is octane 95 unleaded fuel sold here?">
+    <input type="choice" category="Details" name="HGV Diesel" key="fuel:HGV_diesel" description="Is HGV diesel fuel sold here?" priority="low">
       <choice value="yes" text="Yes"/>
       <choice value="no" text="No"/>
     </input>
-    <input type="choice" category="Details" name="Octane 98" key="octane_98" description="Is octane 98 unleaded fuel sold here?">
+    <input type="choice" category="Details" name="Biodiesel" key="fuel:biodiesel" description="Is biodiesel unleaded fuel sold here?" priority="low">
       <choice value="yes" text="Yes"/>
       <choice value="no" text="No"/>
     </input>
-    <input type="choice" category="Details" name="Octane 100" key="octane_100" description="Is octane 100 unleaded fuel sold here?">
+    <input type="choice" category="Details" name="Octane 91" key="fuel:octane_91" description="Is octane 91 unleaded fuel sold here?" priority="low">
       <choice value="yes" text="Yes"/>
       <choice value="no" text="No"/>
     </input>
-    <input type="choice" category="Details" name="Ethanol" key="ethanol" description="Is ethanol sold here?">
+    <input type="choice" category="Details" name="Octane 95" key="fuel:octane_95" description="Is octane 95 unleaded fuel sold here?" priority="low">
       <choice value="yes" text="Yes"/>
       <choice value="no" text="No"/>
     </input>
-    <input type="choice" category="Details" name="LPG" key="lpg" description="Is LPG (liquid petroleum gas) sold here?">
+    <input type="choice" category="Details" name="Octane 98" key="fuel:octane_98" description="Is octane 98 unleaded fuel sold here?" priority="low">
       <choice value="yes" text="Yes"/>
       <choice value="no" text="No"/>
     </input>
-    <input type="choice" category="Details" name="Octane 91" key="diesel" description="Is octane 91 unleaded fuel sold here?">
+    <input type="choice" category="Details" name="Octane 100" key="fuel:octane_100" description="Is octane 100 unleaded fuel sold here?" priority="low">
       <choice value="yes" text="Yes"/>
       <choice value="no" text="No"/>
     </input>
-    <input type="choice" category="Details" name="Bio-diesel" key="biodiesel" description="Is biodiesel unleaded fuel sold here?">
+    <input type="choice" category="Details" name="Mixture 1:25" key="fuel:1_25" description="Is mixture 1:25 fuel sold here?" priority="low">
+      <choice value="yes" text="Yes"/>
+      <choice value="no" text="No"/>
+    </input>
+    <input type="choice" category="Details" name="Mixture 1:50" key="fuel:1_50" description="Is mixture 1:50 fuel sold here?" priority="low">
+      <choice value="yes" text="Yes"/>
+      <choice value="no" text="No"/>
+    </input>
+    <input type="choice" category="Details" name="E10" key="fuel:e10" description="Is E10 sold here?" priority="low">
+      <choice value="yes" text="Yes"/>
+      <choice value="no" text="No"/>
+    </input>
+    <input type="choice" category="Details" name="E85" key="fuel:e85" description="Is E85 sold here?" priority="low">
+      <choice value="yes" text="Yes"/>
+      <choice value="no" text="No"/>
+    </input>
+    <input type="choice" category="Details" name="Biogas" key="fuel:biogas" description="Is biogas sold here?" priority="low">
+      <choice value="yes" text="Yes"/>
+      <choice value="no" text="No"/>
+    </input>
+    <input type="choice" category="Details" name="CNG" key="fuel:cng" description="Is CNG sold here?" priority="low">
+      <choice value="yes" text="Yes"/>
+      <choice value="no" text="No"/>
+    </input>
+    <input type="choice" category="Details" name="LPG" key="fuel:lpg" description="Is LPG sold here?" priority="low">
+      <choice value="yes" text="Yes"/>
+      <choice value="no" text="No"/>
+    </input>
+    <input type="choice" category="Details" name="Electricity" key="fuel:electricity" description="Is it possible to charge an electric car here?" priority="low">
       <choice value="yes" text="Yes"/>
       <choice value="no" text="No"/>
     </input>
-
-
     <inputSet ref="common"/>
   </feature>
 
   </feature>
 
       
-</featureGroup>
\ No newline at end of file
+</featureGroup>
index cb1f0a946957252e47ae0844447e84a1ce3f5597..801b38d067e7e4717a5ad9de9acd915f2f96da61 100644 (file)
@@ -1,93 +1,90 @@
 <html>
+  <!-- Potlatch 2 script -->
+  <head>
+    <title>Potlatch Two</title>
+    <script type="text/javascript" src="swfobject.js"></script>
+
+    <script>
+      function getArgs() {
+        var args = new Object();
+        var query = location.search.substring(1);
+        var pairs = query.split("&");
+        for(var i = 0; i < pairs.length; i++) {
+          var pos = pairs[i].indexOf('=');
+          if (pos == -1) continue;
+          var argname = pairs[i].substring(0,pos);
+          var value = pairs[i].substring(pos+1);
+          args[argname] = unescape(value);
+        }
+        return args;
+      }
+
+      var changesaved=true;
 
-<!-- Potlatch 2 script -->
-
-<head>
-<title>Potlatch TWO</title>
-<script type="text/javascript" src="swfobject.js"></script>
-
-<script>
-       function getArgs() {
-               var args = new Object();
-               var query = location.search.substring(1);
-               var pairs = query.split("&");
-               for(var i = 0; i < pairs.length; i++) {
-                       var pos = pairs[i].indexOf('=');
-                       if (pos == -1) continue;
-                       var argname = pairs[i].substring(0,pos);
-                       var value = pairs[i].substring(pos+1);
-                       args[argname] = unescape(value);
-               }
-               return args;
-       }
-
-    var changesaved=true;
-  
-    window.onbeforeunload=function() {
+      window.onbeforeunload=function() {
         if (!changesaved) {
-            return 'You have unsaved changes. You need to press the Save button to save them';
+          return 'You have unsaved changes. You need to press the Save button to save them';
         }
-    }
-
-    function markChanged(a) { changesaved=a; } /* called from flash */
-
-       var attributes = {
-               id: "map",
-               name: "map"
-       };
-
-       
-       var args = getArgs();
-       var lat;
-       var lon;
-       var zoom;
-       if (args.lat && args.lon) {
-               lat = parseFloat(args.lat);
-               lon = parseFloat(args.lon);
-       } else {
-               lat=51.875;
-               lon=-1.492;
-               args["lat"] = lat;
-               args["lon"] = lon;
-       }
-
-       if (args.zoom) {
-               zoom = parseInt(args.zoom);
-       } else {
-               zoom = 16;
-               args["zoom"] = 16;
-       }
-
-                       args["api"] = "http://api06.dev.openstreetmap.org/api/0.6/";
-                       args["policy"] = "http://api06.dev.openstreetmap.org/api/crossdomain.xml";
-                       args["connection"] = "XML";
-                       args["oauth_policy"] = "http://api06.dev.openstreetmap.org/oauth/crossdomain.xml";
-                       args["oauth_request_url"] = "http://api06.dev.openstreetmap.org/oauth/request_token";
-                       args["oauth_access_url"] = "http://api06.dev.openstreetmap.org/oauth/access_token";
-                       args["oauth_auth_url"] = "http://api06.dev.openstreetmap.org/oauth/authorize";
-                       args["oauth_consumer_key"] = "fiM1IoqnKJk4JCfcl63DA";
-                       args["oauth_consumer_secret"] = "7fYgJK9M4vB1CvBZ6jEsPGxYK9UD1hEnI6NqTxNGs";
-                       args["serverName"] = "api06 Test On Dev";
-               args["show_help"] = "once";
-               args["site_name"] = "OpenStreetMap";
-               args["force_auth"] = "force";
-       
-       var params = false;
-       
-       swfobject.embedSWF("potlatch2.swf?d="+Math.round(Math.random()*1000), "mapHolder", "100%", "100%", "9.0.0", "expressInstall.swf", args, params, attributes);
-</script>
-
-
-</head>
-
-<body>
-
-<div id="mapHolder" style="width:100%; height: 100%; border: 1px solid black">
-       If you see this message you need to install Flash Play 9.0 or above, from Adobe, <a href="http://get.adobe.com/flashplayer/" target="_blank">available here</a> in order to use Potlatch 2
-</div>
-
-
-
-</body>
+      }
+
+      function markChanged(a) { changesaved=a; } /* called from flash */
+
+      var attributes = {
+        id: "map",
+        name: "map"
+      };
+
+
+      var args = getArgs();
+      var lat;
+      var lon;
+      var zoom;
+      if (args.lat && args.lon) {
+        lat = parseFloat(args.lat);
+        lon = parseFloat(args.lon);
+        } else {
+        lat=51.875;
+        lon=-1.492;
+        args["lat"] = lat;
+        args["lon"] = lon;
+      }
+
+      if (args.zoom) {
+        zoom = parseInt(args.zoom);
+        } else {
+        zoom = 16;
+        args["zoom"] = 16;
+      }
+
+      args["api"] = "http://api06.dev.openstreetmap.org/api/0.6/";
+      args["policy"] = "http://api06.dev.openstreetmap.org/api/crossdomain.xml";
+      args["connection"] = "XML";
+      args["oauth_policy"] = "http://api06.dev.openstreetmap.org/oauth/crossdomain.xml";
+      args["oauth_request_url"] = "http://api06.dev.openstreetmap.org/oauth/request_token";
+      args["oauth_access_url"] = "http://api06.dev.openstreetmap.org/oauth/access_token";
+      args["oauth_auth_url"] = "http://api06.dev.openstreetmap.org/oauth/authorize";
+      args["oauth_consumer_key"] = "fiM1IoqnKJk4JCfcl63DA";
+      args["oauth_consumer_secret"] = "7fYgJK9M4vB1CvBZ6jEsPGxYK9UD1hEnI6NqTxNGs";
+      args["serverName"] = "api06 Test On Dev";
+      args["show_help"] = "once";
+      args["site_name"] = "OpenStreetMap";
+      args["force_auth"] = "force";
+
+      var params = false;
+
+      swfobject.embedSWF("potlatch2.swf?d="+Math.round(Math.random()*1000), "mapHolder", "100%", "100%", "9.0.0", "expressInstall.swf", args, params, attributes);
+    </script>
+
+
+  </head>
+
+  <body>
+
+    <div id="mapHolder" style="width:100%; height: 100%; border: 1px solid black">
+      If you see this message you need to install Flash Play 9.0 or above, from Adobe, <a href="http://get.adobe.com/flashplayer/" target="_blank">available here</a> in order to use Potlatch 2
+    </div>
+
+
+  </body>
 </html>
 
old mode 100644 (file)
new mode 100755 (executable)