one or two icons
authorRichard Fairhurst <richard@systemed.net>
Fri, 9 Jul 2010 15:31:58 +0000 (15:31 +0000)
committerRichard Fairhurst <richard@systemed.net>
Fri, 9 Jul 2010 15:31:58 +0000 (15:31 +0000)
70 files changed:
net/systemeD/potlatch2/TagViewer.mxml
resources/features/pois/accommodation_bed_and_breakfast.n.24.png [new file with mode: 0644]
resources/features/pois/accommodation_camping.n.24.png [new file with mode: 0644]
resources/features/pois/accommodation_caravan_park.n.24.png [new file with mode: 0644]
resources/features/pois/accommodation_hotel.n.24.png [new file with mode: 0644]
resources/features/pois/accommodation_youth_hostel.n.24.png [new file with mode: 0644]
resources/features/pois/amenity_firestation2.n.24.png [new file with mode: 0644]
resources/features/pois/amenity_police2.n.24.png [new file with mode: 0644]
resources/features/pois/amenity_post_box.n.24.png [new file with mode: 0644]
resources/features/pois/amenity_recycling.n.24.png [new file with mode: 0644]
resources/features/pois/barrier_bollard.n.24.png [new file with mode: 0644]
resources/features/pois/barrier_gate.n.24.png [new file with mode: 0644]
resources/features/pois/barrier_toll_booth.n.24.png [new file with mode: 0644]
resources/features/pois/education_school.n.24.png [new file with mode: 0644]
resources/features/pois/food_bar.n.24.png [new file with mode: 0644]
resources/features/pois/food_cafe.n.24.png [new file with mode: 0644]
resources/features/pois/food_fastfood.n.24.png [new file with mode: 0644]
resources/features/pois/food_pub.n.24.png [new file with mode: 0644]
resources/features/pois/food_restaurant.n.24.png [new file with mode: 0644]
resources/features/pois/health_hospital.n.24.png [new file with mode: 0644]
resources/features/pois/health_pharmacy.n.24.png [new file with mode: 0644]
resources/features/pois/money_atm.n.24.png [new file with mode: 0644]
resources/features/pois/money_bank2.n.24.png [new file with mode: 0644]
resources/features/pois/shopping_alcohol.n.24.png [new file with mode: 0644]
resources/features/pois/shopping_bakery.n.24.png [new file with mode: 0644]
resources/features/pois/shopping_bicycle.n.24.png [new file with mode: 0644]
resources/features/pois/shopping_book.n.24.png [new file with mode: 0644]
resources/features/pois/shopping_butcher.n.24.png [new file with mode: 0644]
resources/features/pois/shopping_car.n.24.png [new file with mode: 0644]
resources/features/pois/shopping_car_repair.n.24.png [new file with mode: 0644]
resources/features/pois/shopping_clothes.n.24.png [new file with mode: 0644]
resources/features/pois/shopping_confectionery.n.24.png [new file with mode: 0644]
resources/features/pois/shopping_convenience.n.24.png [new file with mode: 0644]
resources/features/pois/shopping_diy.n.24.png [new file with mode: 0644]
resources/features/pois/shopping_fish.n.24.png [new file with mode: 0644]
resources/features/pois/shopping_garden_centre.n.24.png [new file with mode: 0644]
resources/features/pois/shopping_gift.n.24.png [new file with mode: 0644]
resources/features/pois/shopping_greengrocer.n.24.png [new file with mode: 0644]
resources/features/pois/shopping_hairdresser.n.24.png [new file with mode: 0644]
resources/features/pois/shopping_hifi.n.24.png [new file with mode: 0644]
resources/features/pois/shopping_jewelry.n.24.png [new file with mode: 0644]
resources/features/pois/shopping_laundrette.n.24.png [new file with mode: 0644]
resources/features/pois/shopping_motorcycle.n.24.png [new file with mode: 0644]
resources/features/pois/shopping_music.n.24.png [new file with mode: 0644]
resources/features/pois/shopping_supermarket.n.24.png [new file with mode: 0644]
resources/features/pois/tourist_archaeological.n.24.png [new file with mode: 0644]
resources/features/pois/tourist_battlefield.n.24.png [new file with mode: 0644]
resources/features/pois/tourist_castle.n.24.png [new file with mode: 0644]
resources/features/pois/tourist_cinema.n.24.png [new file with mode: 0644]
resources/features/pois/tourist_memorial.n.24.png [new file with mode: 0644]
resources/features/pois/tourist_monument.n.24.png [new file with mode: 0644]
resources/features/pois/tourist_museum.n.24.png [new file with mode: 0644]
resources/features/pois/tourist_picnic.n.24.png [new file with mode: 0644]
resources/features/pois/tourist_ruin.n.24.png [new file with mode: 0644]
resources/features/pois/tourist_theatre.n.24.png [new file with mode: 0644]
resources/features/pois/tourist_view_point.n.24.png [new file with mode: 0644]
resources/features/pois/tourist_zoo.n.24.png [new file with mode: 0644]
resources/features/pois/transport_aerodrome.n.24.png [new file with mode: 0644]
resources/features/pois/transport_bus_station.n.24.png [new file with mode: 0644]
resources/features/pois/transport_bus_stop2.n.24.png [new file with mode: 0644]
resources/features/pois/transport_fuel.n.24.png [new file with mode: 0644]
resources/features/pois/transport_parking_bicycle.n.24.png [new file with mode: 0644]
resources/features/pois/transport_parking_car.n.24.png [new file with mode: 0644]
resources/features/pois/transport_port.n.24.png [new file with mode: 0644]
resources/features/pois/transport_rental_bicycle.n.24.png [new file with mode: 0644]
resources/features/pois/transport_rental_car.n.24.png [new file with mode: 0644]
resources/features/pois/transport_taxi_rank.n.24.png [new file with mode: 0644]
resources/features/pois/transport_train_station.n.24.png [new file with mode: 0644]
resources/features/pois/transport_tram_stop.n.24.png [new file with mode: 0644]
resources/map_features.xml

index e5f613b..65695a4 100644 (file)
@@ -7,7 +7,7 @@
     initialize="loadFeatures()">
 
 <mx:ViewStack id="sidebar" width="100%" height="100%" creationPolicy="all">
-  <mx:VBox id="dndPanel" width="100%" height="100%">
+  <mx:VBox id="dndPanel" width="100%" height="100%" horizontalScrollPolicy="off">
     <mx:Text id="dndPanelText" text="{dndPrompt}" automationName="{dndPrompt}" />
        <mx:Repeater id="dndRep" dataProvider="{MapFeatures.getInstance().getCategoriesForType('point')}">
                <mx:HBox width="100%"><mx:Label text="{dndRep.currentItem.name}"/></mx:HBox>
@@ -37,7 +37,7 @@
                                                                DragManager.doDrag(dragInitiator, dragSource, event, dragProxy);
                                                        }
                                                ]]></mx:Script>
-                                               <mx:Image id="foo" source="{data.image}" height="25" width="25" mouseMove="dragPOI(event, data.tags)" toolTip="{data.name}" />
+                                               <mx:Image id="foo" source="{data.image}" height="24" width="24" mouseMove="dragPOI(event, data.tags)" toolTip="{data.name}" />
                                        </mx:VBox>
                                </mx:Component>
                        </mx:itemRenderer>
                        icon="@Embed('../../../embedded/view_tabbed.png')"
                        disabledIcon="@Embed('../../../embedded/view_tabbed_disabled.png')"
                        click="setEditorStackUI(true)" id="tabNavigatorLabel" paddingTop="6" 
+                       toolTip="Show in tabs"
                        enabled="{editorStack is Accordion &amp;&amp; stack.selectedIndex==0}" />
                <mx:LinkButton
                        icon="@Embed('../../../embedded/view_accordion.png')" 
                        disabledIcon="@Embed('../../../embedded/view_accordion_disabled.png')"
                        click="setEditorStackUI(false)" id="accordionLabel" paddingTop="6"
+                       toolTip="Show in sliding windows"
                        enabled="{editorStack is SuperTabNavigator &amp;&amp; stack.selectedIndex==0}" />
          </mx:HBox>
   </mx:VBox>
                       editorBox.addChild(editor);
               }
               var category:String = factory.category;
-              var tab:VBox = tabs[category];
-              if ( tab == null ) {
-                  tab = createEditorBox();
-                  tab.label = category;
-                  editorStack.addChild(tab);
-                  tabs[category] = tab;
-                  tabComponents[tab] = [];
+              if (category!='') {
+                     var tab:VBox = tabs[category];
+                     if ( tab == null) {
+                         tab = createEditorBox();
+                         tab.label = category;
+                         editorStack.addChild(tab);
+                         tabs[category] = tab;
+                         tabComponents[tab] = [];
+                     }
+                     var catEditor:DisplayObject = factory.createEditorInstance(selectedEntity);
+                     if ( catEditor != null )
+                         tabComponents[tab].push(catEditor);
+                     //    tab.addChild(catEditor);
               }
-              var catEditor:DisplayObject = factory.createEditorInstance(selectedEntity);
-              if ( catEditor != null )
-                  tabComponents[tab].push(catEditor);
-              //    tab.addChild(catEditor);
           }
       }
       
diff --git a/resources/features/pois/accommodation_bed_and_breakfast.n.24.png b/resources/features/pois/accommodation_bed_and_breakfast.n.24.png
new file mode 100644 (file)
index 0000000..e40e3d8
Binary files /dev/null and b/resources/features/pois/accommodation_bed_and_breakfast.n.24.png differ
diff --git a/resources/features/pois/accommodation_camping.n.24.png b/resources/features/pois/accommodation_camping.n.24.png
new file mode 100644 (file)
index 0000000..926bd4a
Binary files /dev/null and b/resources/features/pois/accommodation_camping.n.24.png differ
diff --git a/resources/features/pois/accommodation_caravan_park.n.24.png b/resources/features/pois/accommodation_caravan_park.n.24.png
new file mode 100644 (file)
index 0000000..6a0c952
Binary files /dev/null and b/resources/features/pois/accommodation_caravan_park.n.24.png differ
diff --git a/resources/features/pois/accommodation_hotel.n.24.png b/resources/features/pois/accommodation_hotel.n.24.png
new file mode 100644 (file)
index 0000000..129a44c
Binary files /dev/null and b/resources/features/pois/accommodation_hotel.n.24.png differ
diff --git a/resources/features/pois/accommodation_youth_hostel.n.24.png b/resources/features/pois/accommodation_youth_hostel.n.24.png
new file mode 100644 (file)
index 0000000..13f18df
Binary files /dev/null and b/resources/features/pois/accommodation_youth_hostel.n.24.png differ
diff --git a/resources/features/pois/amenity_firestation2.n.24.png b/resources/features/pois/amenity_firestation2.n.24.png
new file mode 100644 (file)
index 0000000..443189f
Binary files /dev/null and b/resources/features/pois/amenity_firestation2.n.24.png differ
diff --git a/resources/features/pois/amenity_police2.n.24.png b/resources/features/pois/amenity_police2.n.24.png
new file mode 100644 (file)
index 0000000..a9d6566
Binary files /dev/null and b/resources/features/pois/amenity_police2.n.24.png differ
diff --git a/resources/features/pois/amenity_post_box.n.24.png b/resources/features/pois/amenity_post_box.n.24.png
new file mode 100644 (file)
index 0000000..4b5eb86
Binary files /dev/null and b/resources/features/pois/amenity_post_box.n.24.png differ
diff --git a/resources/features/pois/amenity_recycling.n.24.png b/resources/features/pois/amenity_recycling.n.24.png
new file mode 100644 (file)
index 0000000..d608f7d
Binary files /dev/null and b/resources/features/pois/amenity_recycling.n.24.png differ
diff --git a/resources/features/pois/barrier_bollard.n.24.png b/resources/features/pois/barrier_bollard.n.24.png
new file mode 100644 (file)
index 0000000..3000661
Binary files /dev/null and b/resources/features/pois/barrier_bollard.n.24.png differ
diff --git a/resources/features/pois/barrier_gate.n.24.png b/resources/features/pois/barrier_gate.n.24.png
new file mode 100644 (file)
index 0000000..0c18c5e
Binary files /dev/null and b/resources/features/pois/barrier_gate.n.24.png differ
diff --git a/resources/features/pois/barrier_toll_booth.n.24.png b/resources/features/pois/barrier_toll_booth.n.24.png
new file mode 100644 (file)
index 0000000..302492a
Binary files /dev/null and b/resources/features/pois/barrier_toll_booth.n.24.png differ
diff --git a/resources/features/pois/education_school.n.24.png b/resources/features/pois/education_school.n.24.png
new file mode 100644 (file)
index 0000000..40abf2b
Binary files /dev/null and b/resources/features/pois/education_school.n.24.png differ
diff --git a/resources/features/pois/food_bar.n.24.png b/resources/features/pois/food_bar.n.24.png
new file mode 100644 (file)
index 0000000..a63a09d
Binary files /dev/null and b/resources/features/pois/food_bar.n.24.png differ
diff --git a/resources/features/pois/food_cafe.n.24.png b/resources/features/pois/food_cafe.n.24.png
new file mode 100644 (file)
index 0000000..9e9b317
Binary files /dev/null and b/resources/features/pois/food_cafe.n.24.png differ
diff --git a/resources/features/pois/food_fastfood.n.24.png b/resources/features/pois/food_fastfood.n.24.png
new file mode 100644 (file)
index 0000000..96f5e77
Binary files /dev/null and b/resources/features/pois/food_fastfood.n.24.png differ
diff --git a/resources/features/pois/food_pub.n.24.png b/resources/features/pois/food_pub.n.24.png
new file mode 100644 (file)
index 0000000..714914f
Binary files /dev/null and b/resources/features/pois/food_pub.n.24.png differ
diff --git a/resources/features/pois/food_restaurant.n.24.png b/resources/features/pois/food_restaurant.n.24.png
new file mode 100644 (file)
index 0000000..e7813ea
Binary files /dev/null and b/resources/features/pois/food_restaurant.n.24.png differ
diff --git a/resources/features/pois/health_hospital.n.24.png b/resources/features/pois/health_hospital.n.24.png
new file mode 100644 (file)
index 0000000..e9b114a
Binary files /dev/null and b/resources/features/pois/health_hospital.n.24.png differ
diff --git a/resources/features/pois/health_pharmacy.n.24.png b/resources/features/pois/health_pharmacy.n.24.png
new file mode 100644 (file)
index 0000000..4fe2fc7
Binary files /dev/null and b/resources/features/pois/health_pharmacy.n.24.png differ
diff --git a/resources/features/pois/money_atm.n.24.png b/resources/features/pois/money_atm.n.24.png
new file mode 100644 (file)
index 0000000..e081dd5
Binary files /dev/null and b/resources/features/pois/money_atm.n.24.png differ
diff --git a/resources/features/pois/money_bank2.n.24.png b/resources/features/pois/money_bank2.n.24.png
new file mode 100644 (file)
index 0000000..873adc7
Binary files /dev/null and b/resources/features/pois/money_bank2.n.24.png differ
diff --git a/resources/features/pois/shopping_alcohol.n.24.png b/resources/features/pois/shopping_alcohol.n.24.png
new file mode 100644 (file)
index 0000000..c22cc3b
Binary files /dev/null and b/resources/features/pois/shopping_alcohol.n.24.png differ
diff --git a/resources/features/pois/shopping_bakery.n.24.png b/resources/features/pois/shopping_bakery.n.24.png
new file mode 100644 (file)
index 0000000..f588a19
Binary files /dev/null and b/resources/features/pois/shopping_bakery.n.24.png differ
diff --git a/resources/features/pois/shopping_bicycle.n.24.png b/resources/features/pois/shopping_bicycle.n.24.png
new file mode 100644 (file)
index 0000000..dce1d15
Binary files /dev/null and b/resources/features/pois/shopping_bicycle.n.24.png differ
diff --git a/resources/features/pois/shopping_book.n.24.png b/resources/features/pois/shopping_book.n.24.png
new file mode 100644 (file)
index 0000000..51441ea
Binary files /dev/null and b/resources/features/pois/shopping_book.n.24.png differ
diff --git a/resources/features/pois/shopping_butcher.n.24.png b/resources/features/pois/shopping_butcher.n.24.png
new file mode 100644 (file)
index 0000000..8efbb3f
Binary files /dev/null and b/resources/features/pois/shopping_butcher.n.24.png differ
diff --git a/resources/features/pois/shopping_car.n.24.png b/resources/features/pois/shopping_car.n.24.png
new file mode 100644 (file)
index 0000000..cefb912
Binary files /dev/null and b/resources/features/pois/shopping_car.n.24.png differ
diff --git a/resources/features/pois/shopping_car_repair.n.24.png b/resources/features/pois/shopping_car_repair.n.24.png
new file mode 100644 (file)
index 0000000..6abdcb7
Binary files /dev/null and b/resources/features/pois/shopping_car_repair.n.24.png differ
diff --git a/resources/features/pois/shopping_clothes.n.24.png b/resources/features/pois/shopping_clothes.n.24.png
new file mode 100644 (file)
index 0000000..e5c7089
Binary files /dev/null and b/resources/features/pois/shopping_clothes.n.24.png differ
diff --git a/resources/features/pois/shopping_confectionery.n.24.png b/resources/features/pois/shopping_confectionery.n.24.png
new file mode 100644 (file)
index 0000000..2e1dbae
Binary files /dev/null and b/resources/features/pois/shopping_confectionery.n.24.png differ
diff --git a/resources/features/pois/shopping_convenience.n.24.png b/resources/features/pois/shopping_convenience.n.24.png
new file mode 100644 (file)
index 0000000..7a35633
Binary files /dev/null and b/resources/features/pois/shopping_convenience.n.24.png differ
diff --git a/resources/features/pois/shopping_diy.n.24.png b/resources/features/pois/shopping_diy.n.24.png
new file mode 100644 (file)
index 0000000..c8236cb
Binary files /dev/null and b/resources/features/pois/shopping_diy.n.24.png differ
diff --git a/resources/features/pois/shopping_fish.n.24.png b/resources/features/pois/shopping_fish.n.24.png
new file mode 100644 (file)
index 0000000..fe5ecce
Binary files /dev/null and b/resources/features/pois/shopping_fish.n.24.png differ
diff --git a/resources/features/pois/shopping_garden_centre.n.24.png b/resources/features/pois/shopping_garden_centre.n.24.png
new file mode 100644 (file)
index 0000000..416247f
Binary files /dev/null and b/resources/features/pois/shopping_garden_centre.n.24.png differ
diff --git a/resources/features/pois/shopping_gift.n.24.png b/resources/features/pois/shopping_gift.n.24.png
new file mode 100644 (file)
index 0000000..a816178
Binary files /dev/null and b/resources/features/pois/shopping_gift.n.24.png differ
diff --git a/resources/features/pois/shopping_greengrocer.n.24.png b/resources/features/pois/shopping_greengrocer.n.24.png
new file mode 100644 (file)
index 0000000..ad402d5
Binary files /dev/null and b/resources/features/pois/shopping_greengrocer.n.24.png differ
diff --git a/resources/features/pois/shopping_hairdresser.n.24.png b/resources/features/pois/shopping_hairdresser.n.24.png
new file mode 100644 (file)
index 0000000..e844989
Binary files /dev/null and b/resources/features/pois/shopping_hairdresser.n.24.png differ
diff --git a/resources/features/pois/shopping_hifi.n.24.png b/resources/features/pois/shopping_hifi.n.24.png
new file mode 100644 (file)
index 0000000..66ec0b9
Binary files /dev/null and b/resources/features/pois/shopping_hifi.n.24.png differ
diff --git a/resources/features/pois/shopping_jewelry.n.24.png b/resources/features/pois/shopping_jewelry.n.24.png
new file mode 100644 (file)
index 0000000..c3e8a51
Binary files /dev/null and b/resources/features/pois/shopping_jewelry.n.24.png differ
diff --git a/resources/features/pois/shopping_laundrette.n.24.png b/resources/features/pois/shopping_laundrette.n.24.png
new file mode 100644 (file)
index 0000000..55a0ca2
Binary files /dev/null and b/resources/features/pois/shopping_laundrette.n.24.png differ
diff --git a/resources/features/pois/shopping_motorcycle.n.24.png b/resources/features/pois/shopping_motorcycle.n.24.png
new file mode 100644 (file)
index 0000000..cf4248f
Binary files /dev/null and b/resources/features/pois/shopping_motorcycle.n.24.png differ
diff --git a/resources/features/pois/shopping_music.n.24.png b/resources/features/pois/shopping_music.n.24.png
new file mode 100644 (file)
index 0000000..17df5c5
Binary files /dev/null and b/resources/features/pois/shopping_music.n.24.png differ
diff --git a/resources/features/pois/shopping_supermarket.n.24.png b/resources/features/pois/shopping_supermarket.n.24.png
new file mode 100644 (file)
index 0000000..fd25846
Binary files /dev/null and b/resources/features/pois/shopping_supermarket.n.24.png differ
diff --git a/resources/features/pois/tourist_archaeological.n.24.png b/resources/features/pois/tourist_archaeological.n.24.png
new file mode 100644 (file)
index 0000000..a75a358
Binary files /dev/null and b/resources/features/pois/tourist_archaeological.n.24.png differ
diff --git a/resources/features/pois/tourist_battlefield.n.24.png b/resources/features/pois/tourist_battlefield.n.24.png
new file mode 100644 (file)
index 0000000..b502bfc
Binary files /dev/null and b/resources/features/pois/tourist_battlefield.n.24.png differ
diff --git a/resources/features/pois/tourist_castle.n.24.png b/resources/features/pois/tourist_castle.n.24.png
new file mode 100644 (file)
index 0000000..75734d6
Binary files /dev/null and b/resources/features/pois/tourist_castle.n.24.png differ
diff --git a/resources/features/pois/tourist_cinema.n.24.png b/resources/features/pois/tourist_cinema.n.24.png
new file mode 100644 (file)
index 0000000..4207e84
Binary files /dev/null and b/resources/features/pois/tourist_cinema.n.24.png differ
diff --git a/resources/features/pois/tourist_memorial.n.24.png b/resources/features/pois/tourist_memorial.n.24.png
new file mode 100644 (file)
index 0000000..2729e68
Binary files /dev/null and b/resources/features/pois/tourist_memorial.n.24.png differ
diff --git a/resources/features/pois/tourist_monument.n.24.png b/resources/features/pois/tourist_monument.n.24.png
new file mode 100644 (file)
index 0000000..853632b
Binary files /dev/null and b/resources/features/pois/tourist_monument.n.24.png differ
diff --git a/resources/features/pois/tourist_museum.n.24.png b/resources/features/pois/tourist_museum.n.24.png
new file mode 100644 (file)
index 0000000..3cdea51
Binary files /dev/null and b/resources/features/pois/tourist_museum.n.24.png differ
diff --git a/resources/features/pois/tourist_picnic.n.24.png b/resources/features/pois/tourist_picnic.n.24.png
new file mode 100644 (file)
index 0000000..6943ab4
Binary files /dev/null and b/resources/features/pois/tourist_picnic.n.24.png differ
diff --git a/resources/features/pois/tourist_ruin.n.24.png b/resources/features/pois/tourist_ruin.n.24.png
new file mode 100644 (file)
index 0000000..d8650c1
Binary files /dev/null and b/resources/features/pois/tourist_ruin.n.24.png differ
diff --git a/resources/features/pois/tourist_theatre.n.24.png b/resources/features/pois/tourist_theatre.n.24.png
new file mode 100644 (file)
index 0000000..a5db00b
Binary files /dev/null and b/resources/features/pois/tourist_theatre.n.24.png differ
diff --git a/resources/features/pois/tourist_view_point.n.24.png b/resources/features/pois/tourist_view_point.n.24.png
new file mode 100644 (file)
index 0000000..a2dde9e
Binary files /dev/null and b/resources/features/pois/tourist_view_point.n.24.png differ
diff --git a/resources/features/pois/tourist_zoo.n.24.png b/resources/features/pois/tourist_zoo.n.24.png
new file mode 100644 (file)
index 0000000..f33b9d8
Binary files /dev/null and b/resources/features/pois/tourist_zoo.n.24.png differ
diff --git a/resources/features/pois/transport_aerodrome.n.24.png b/resources/features/pois/transport_aerodrome.n.24.png
new file mode 100644 (file)
index 0000000..83b7ecc
Binary files /dev/null and b/resources/features/pois/transport_aerodrome.n.24.png differ
diff --git a/resources/features/pois/transport_bus_station.n.24.png b/resources/features/pois/transport_bus_station.n.24.png
new file mode 100644 (file)
index 0000000..e9cdc7e
Binary files /dev/null and b/resources/features/pois/transport_bus_station.n.24.png differ
diff --git a/resources/features/pois/transport_bus_stop2.n.24.png b/resources/features/pois/transport_bus_stop2.n.24.png
new file mode 100644 (file)
index 0000000..d81484a
Binary files /dev/null and b/resources/features/pois/transport_bus_stop2.n.24.png differ
diff --git a/resources/features/pois/transport_fuel.n.24.png b/resources/features/pois/transport_fuel.n.24.png
new file mode 100644 (file)
index 0000000..736e943
Binary files /dev/null and b/resources/features/pois/transport_fuel.n.24.png differ
diff --git a/resources/features/pois/transport_parking_bicycle.n.24.png b/resources/features/pois/transport_parking_bicycle.n.24.png
new file mode 100644 (file)
index 0000000..42f2e54
Binary files /dev/null and b/resources/features/pois/transport_parking_bicycle.n.24.png differ
diff --git a/resources/features/pois/transport_parking_car.n.24.png b/resources/features/pois/transport_parking_car.n.24.png
new file mode 100644 (file)
index 0000000..6aa900c
Binary files /dev/null and b/resources/features/pois/transport_parking_car.n.24.png differ
diff --git a/resources/features/pois/transport_port.n.24.png b/resources/features/pois/transport_port.n.24.png
new file mode 100644 (file)
index 0000000..6e5f6e1
Binary files /dev/null and b/resources/features/pois/transport_port.n.24.png differ
diff --git a/resources/features/pois/transport_rental_bicycle.n.24.png b/resources/features/pois/transport_rental_bicycle.n.24.png
new file mode 100644 (file)
index 0000000..773ac43
Binary files /dev/null and b/resources/features/pois/transport_rental_bicycle.n.24.png differ
diff --git a/resources/features/pois/transport_rental_car.n.24.png b/resources/features/pois/transport_rental_car.n.24.png
new file mode 100644 (file)
index 0000000..5570e70
Binary files /dev/null and b/resources/features/pois/transport_rental_car.n.24.png differ
diff --git a/resources/features/pois/transport_taxi_rank.n.24.png b/resources/features/pois/transport_taxi_rank.n.24.png
new file mode 100644 (file)
index 0000000..8fd3073
Binary files /dev/null and b/resources/features/pois/transport_taxi_rank.n.24.png differ
diff --git a/resources/features/pois/transport_train_station.n.24.png b/resources/features/pois/transport_train_station.n.24.png
new file mode 100644 (file)
index 0000000..6e1cb10
Binary files /dev/null and b/resources/features/pois/transport_train_station.n.24.png differ
diff --git a/resources/features/pois/transport_tram_stop.n.24.png b/resources/features/pois/transport_tram_stop.n.24.png
new file mode 100644 (file)
index 0000000..edf5348
Binary files /dev/null and b/resources/features/pois/transport_tram_stop.n.24.png differ
index 2207bd5..9fb27d6 100644 (file)
   <category name="Buildings" id="buildings">
   </category>
 
+  <category name="Landuse" id="landuse">
+  </category>
+
   <category name="Entertainment" id="entertainment">
   </category>
   
-  <category name="Shopping" id="shopping">
+  <category name="Amenity" id="amenity">
   </category>
 
-  <category name="Amenity" id="amenity">
+  <category name="Tourism" id="tourism">
+  </category>
+
+  <category name="Shopping" id="shopping">
   </category>
 
   <category name="Advanced" id="advanced">
 
   <!-- Common input sets -->
   
+  <inputSet id="simpleName">
+    <input type="freetext" presence="always" name="Name" key="name" description="The name" priority="highest" />
+  </inputSet>
+
   <inputSet id="names">
     <input type="freetext" presence="always"
         name="Name" category="Naming" priority="highest"
     <inputSet ref="cycle"/>
     <inputSet ref="bus-route"/>
   </inputSet>
+
+  <inputSet id="path">
+    <inputSet ref="simpleName"/>
+    <inputSet ref="roadPhysical"/>
+    <inputSet ref="cycle"/>
+    <inputSet ref="ldp"/>
+  </inputSet>
   
   <inputSet id="junctionNode">
     <inputSet ref="turnRestrictions"/>
         key="layer" min="-5" max="5" default="0"/>
     <input type="freetext" presence="onTagMatch"
         name="Width" category="Physical"
-        key="width" description="Width of the road"/>
+        key="width" description="Width of the road" layout="horizontal"/>
     <input type="choice" presence="onTagMatch"
         name="Surface" category="Physical" description="Type of road surface"
-        key="surface">
+        key="surface" layout="horizontal">
       <choice value="unpaved" text="Unpaved" description="Road surface is unsealed"/>
       <choice value="paved" text="Paved" description="Road surface is sealed"/>
       <choice value="asphalt" text="Asphalt"/>
   <inputSet id="bridge">
     <input type="choice" presence="onTagMatch"
         name="Bridge" category="Physical" description="Road goes over a bridge"
-        key="bridge">
+        key="bridge" layout="horizontal">
       <choice value="yes" text="Generic Bridge" description="Generic bridge -- type unknown"/>
       <choice value="viaduct" text="Viaduct" description="Viaduct"/>
       <choice value="suspension" text="Suspension bridge"/>
   <inputSet id="tunnel">
     <input type="choice" presence="onTagMatch"
         name="Tunnel" category="Physical" description="Road goes into a tunnel"
-        key="tunnel">
+        key="tunnel" layout="horizontal">
       <choice value="yes" text="Tunnel" description="Generic tunnel"/>
     </input>
   </inputSet>
        </icon>
     </input>
   </inputSet>
+
+  <inputSet id="ldp">
+    <input type="route" name="National Walking Route" description="National walking route" category="Walking" priority="normal">
+       <match k="type" v="route"/>
+       <match k="network" v="nwn"/>
+       <icon background="red" foreground="white">
+         <font size="14pt"><b>${ref}</b></font><br />
+         <font size="12pt">${name}</font>
+       </icon>
+    </input>
+    <input type="route" name="Regional Walking Route" description="Regional walking route" category="Walking" priority="low">
+       <match k="type" v="route"/>
+       <match k="network" v="rwn"/>
+       <icon background="cyan" foreground="white">
+         <font size="14pt"><b>${ref}</b></font><br />
+         <font size="12pt">${name}</font>
+       </icon>
+    </input>
+    <input type="route" name="Local Walking Route" description="Local walking route" category="Walking" priority="lowest">
+       <match k="type" v="route"/>
+       <match k="network" v="lwn"/>
+       <icon background="blue" foreground="white">
+         <font size="14pt"><b>${ref}</b></font><br />
+         <font size="12pt">${name}</font>
+       </icon>
+    </input>
+  </inputSet>
   
   <inputSet id="route">
     <inputSet ref="names"/>
     <input type="freetext" presence="always" name="Width" category="Properties" key="width" description="The width in metres" />
   </inputSet>
   
+  <!-- ************************************************************************
+       Roads
+       ************************************************************************ -->
+
   <feature name="Motorway">
     <category>roads</category>
     <icon image="features/highway__motorway.png">
     <inputSet ref="majorRoad"/>
   </feature>
 
-  <feature name="Trunk Road">
+  <feature name="Trunk road">
     <category>roads</category>
     <icon image="features/highway__trunk.png">
       <font size="16pt"><b>${ref}</b></font><br/>
     <inputSet ref="majorRoad"/>
   </feature>
 
-  <feature name="Primary Road">
+  <feature name="Trunk link" icon="features/motorway_link.png">
+    <category>roads</category>
+    <line/>
+    <tag k="highway" v="trunk_link"/>
+
+    <inputSet ref="majorRoad"/>
+  </feature>
+
+  <feature name="Primary road">
     <category>roads</category>
     <icon>
       <font size="16pt"><b>${ref}</b></font><br/>
     <inputSet ref="majorRoad"/>
   </feature>
 
-  <feature name="Secondary Road">
+  <feature name="Secondary road">
     <category>roads</category>
     <icon>
       <font size="16pt"><b>${ref}</b></font><br/>
     <inputSet ref="majorRoad"/>
   </feature>
 
-  <feature name="Tertiary Road">
+  <feature name="Tertiary road">
     <category>roads</category>
     <icon>
       <font size="14pt"><b>${name}</b></font><br/>
     <inputSet ref="majorRoad"/>
   </feature>
 
-  <feature name="Residential Road">
+  <feature name="Minor road">
     <category>roads</category>
-    <icon image="features/highway__residential.png">
-      <font size="14pt"><b>${name}</b></font><br/>
-      <font size="8pt">${postal_code}</font><br/>
+    <icon image="features/highway__unclassified.png">
+      <font size="14pt"><b>${name}</b></font>
     </icon>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:highway%3Dresidential</help>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:highway%3Dunclassified</help>
 
     <line/>
-    <tag k="highway" v="residential"/>
+    <tag k="highway" v="unclassified"/>
 
     <inputSet ref="minorRoad"/>
   </feature>
 
-  <feature name="Road">
+  <feature name="Residential road">
     <category>roads</category>
-    <icon image="features/highway__unclassified.png">
-      <font size="14pt"><b>${name}</b></font>
+    <icon image="features/highway__residential.png">
+      <font size="14pt"><b>${name}</b></font><br/>
+      <font size="8pt">${postal_code}</font><br/>
     </icon>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:highway%3Dunclassified</help>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:highway%3Dresidential</help>
 
     <line/>
-    <tag k="highway" v="unclassified"/>
+    <tag k="highway" v="residential"/>
 
     <inputSet ref="minorRoad"/>
   </feature>
 
-  <feature name="Service Road">
+  <feature name="Service road">
     <category>roads</category>
     <icon image="features/highway__service.png">
       <font size="14pt"><b>${name}</b></font>
     <inputSet ref="minorRoad"/>
   </feature>
 
-  <feature name="Unknown Road">
+  <feature name="Unknown road">
     <category>roads</category>
     <icon>
       <font size="10pt">This road has not been given a specific type. It's a road, and that's all that's known.</font>
     <inputSet ref="minorRoad"/>
   </feature>
 
-  <feature name="Track">
-    <category>roads</category>
-    <icon>
-      <font size="14pt"><b>${name}</b></font>
-    </icon>
-
-    <line/>
-    <tag k="highway" v="track"/>
-
-    <inputSet ref="minorRoad"/>
-  </feature>
-
-  <feature name="Pedestrian Road">
+  <feature name="Pedestrian road">
     <category>roads</category>
     <icon>
       <font size="14pt"><b>${name}</b></font>
   </feature>
 
 
+  <!-- ************************************************************************
+       Paths
+       ************************************************************************ -->
+
+  <feature name="Footpath">
+    <category>paths</category>
+    <icon image="features/paths__footway.png">
+      ${name} <i>${ref}</i>
+    </icon>
 
-  <!-- Paths -->
+    <line/>
+    <tag k="highway" v="footway"/>
+    <inputSet ref="path"/>
+  </feature>
 
-  <feature name="Cycle Path">
+  <feature name="Cycle path">
     <category>paths</category>
     <icon image="features/paths__unknown.png">
       ${name} <i>${ncn_ref} ${rcn_ref} ${lcn_ref} ${ref}</i>
 
     <line/>
     <tag k="highway" v="cycleway"/>
-    <inputSet ref="bridge"/>
-    <inputSet ref="tunnel"/>
+    <inputSet ref="path"/>
   </feature>
 
-  <feature name="Foot Path">
+  <feature name="Track">
     <category>paths</category>
-    <icon image="features/paths__footway.png">
-      ${name} <i>${ref}</i>
+    <icon>
+      <font size="14pt"><b>${name}</b></font>
     </icon>
 
     <line/>
-    <tag k="highway" v="footway"/>
-    <inputSet ref="bridge"/>
-    <inputSet ref="tunnel"/>
+    <tag k="highway" v="track"/>
+
+    <inputSet ref="path"/>
   </feature>
 
   <feature name="Bridleway">
 
     <line/>
     <tag k="highway" v="bridleway"/>
+    <inputSet ref="path"/>
   </feature>
 
   <feature name="Steps">
 
     <line/>
     <tag k="highway" v="steps"/>
-    <inputSet ref="names"/>
+    <inputSet ref="path"/>
     <input type="freetext" presence="always" category="Naming" name="Number of steps" key="step_count" description="The number of steps in the way" priority="low"/>
   </feature>
 
-
-  <!-- Barriers -->
+  <!-- ************************************************************************
+       Natural
+       ************************************************************************ -->
 
   <feature name="Fence">
     <category>natural</category>
     <tag k="barrier" v="hedge"/>
   </feature>
 
+  <feature name="Park">
+    <category>natural</category>
+    <icon>
+      <b>${name}</b><br/>
+    </icon>
+
+    <area/>
+    <tag k="leisure" v="park"/>
+  </feature>
+  
+  <feature name="Forest">
+    <category>natural</category>
+    <icon>
+      <b>${name}</b><br/>
+    </icon>
+
+    <area/>
+    <tag k="landuse" v="forest"/>
+  </feature>
+  
+  <!-- ************************************************************************
+       Barrier
+       ************************************************************************ -->
+
   <feature name="Wall">
     <category>barrier</category>
     <icon>
     <tag k="barrier" v="ditch"/>
   </feature>
   
-  <feature name="Retaining Wall">
+  <feature name="Retaining wall">
     <category>barrier</category>
     <icon>
     </icon>
     <tag k="barrier" v="retaining_wall"/>
   </feature>
   
-  <feature name="City Wall">
+  <feature name="City wall">
     <category>barrier</category>
     <icon>
     </icon>
     <line/>
     <tag k="barrier" v="city_wall"/>
   </feature>
-  
-  <!-- node based barriers, most should be of the node in way type -->
-  
-  <feature name="Bollard">
-    <category>barrier</category>
-    <icon image="icons/bollard.png">
-    </icon>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dbollard</help>
-    
-    <point />
-    <tag k="barrier" v="bollard"/>
-  </feature>
-  
-  <feature name="Gate">
-    <category>barrier</category>
-    <icon image="icons/gate.png">
-    </icon>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dgate</help>
-    
-    <point />
-    <tag k="barrier" v="gate"/>
-  </feature>
-  
-  <feature name="Cycle Barrier">
-    <category>barrier</category>
-    <icon image="icons/bollard.png">
-    </icon>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dcycle_barrier</help>
-    
-    <point />
-    <tag k="barrier" v="cycle_barrier"/>
-  </feature>
-  
-  <feature name="Big Concrete Blocks">
-    <category>barrier</category>
-    <icon image="icons/bollard.png">
-    </icon>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dblock</help>
-    
-    <point />
-    <tag k="barrier" v="block"/>
-  </feature>
-  
-  <feature name="Cattle Grid">
-    <category>barrier</category>
-    <icon image="icons/cattle_grid.png">
-    </icon>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dcattle_grid</help>
-    
-    <point />
-    <tag k="barrier" v="cattle_grid"/>
-  </feature>
-  
-  <feature name="Toll Booth">
-    <category>barrier</category>
-    <icon>
-    </icon>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dtoll_booth</help>
-    
-    <point />
-    <tag k="barrier" v="toll_booth"/>
-    <tagSet ref="fee"/>
-    <input type="freetext" presence="onTagMatch" category="Naming" name="Operator" key="operator" description="The provider of the toll" priority="low"/>
-  </feature>
 
-  <!-- Waterway -->
+  <!-- ************************************************************************
+       Waterways
+       ************************************************************************ -->
 
   <feature name="Stream">
     <category>water</category>
     <tag k="waterway" v="canal"/>
   </feature>
 
+  <feature name="Drain">
+    <category>water</category>
+    <icon>
+      <font size="14pt"><b>${name}</b></font>
+    </icon>
+
+    <line/>
+    <tag k="waterway" v="drain"/>
+  </feature>
+
   <feature name="Dam">
     <category>water</category>
     <icon image="features/waterway__dam.png">
     <tag k="waterway" v="dam"/>
   </feature>
 
+  <feature name="Riverbank">
+    <category>water</category>
+    <icon>
+      <font size="14pt"><b>${name}</b></font>
+    </icon>
+
+    <area/>
+    <tag k="waterway" v="riverbank"/>
+  </feature>
+
+  <feature name="Reservoir">
+    <category>water</category>
+    <icon>
+      <font size="14pt"><b>${name}</b></font>
+    </icon>
+
+    <area/>
+    <tag k="landuse" v="reservoir"/>
+  </feature>
+
+  <feature name="Dock">
+    <category>water</category>
+    <icon>
+      <font size="14pt"><b>${name}</b></font>
+    </icon>
+
+    <area/>
+    <tag k="waterway" v="dock"/>
+  </feature>
+
 
-  <!-- Railways -->
+  <!-- ************************************************************************
+       Transport
+       ************************************************************************ -->
 
-  <feature name="Railway Line">
+  <feature name="Railway line">
     <category>transport</category>
     <icon image="features/transport__railway.png">
       <font size="14pt"><b>${name}</b></font>
     <inputSet ref="tunnel"/>
   </feature>
 
-  <feature name="Tram Line">
+  <feature name="Railway spur">
     <category>transport</category>
-    <icon image="features/transport__tram.png">
+    <icon image="features/transport__railway.png">
       <font size="14pt"><b>${name}</b></font>
     </icon>
 
     <line/>
-    <tag k="railway" v="tram"/>
-    <input ref="tram-route"/>
-    <inputSet ref="bridge"/>
-    <inputSet ref="tunnel"/>
+    <tag k="railway" v="rail"/>
+    <tag k="service" v="spur"/>
   </feature>
 
-  <feature name="Subway Line">
+  <feature name="Railway siding">
     <category>transport</category>
-    <icon image="features/transport__subway.png">
+    <icon image="features/transport__railway.png">
       <font size="14pt"><b>${name}</b></font>
     </icon>
 
     <line/>
-    <tag k="railway" v="subway"/>
-    <inputSet ref="bridge"/>
-    <inputSet ref="tunnel"/>
+    <tag k="railway" v="rail"/>
+    <tag k="service" v="siding"/>
   </feature>
 
-  <feature name="Railway Station">
+  <feature name="Preserved line">
     <category>transport</category>
     <icon image="features/transport__railway.png">
       <font size="14pt"><b>${name}</b></font>
     </icon>
-    
-    <point/>
-    <tag k="railway" v="station"/>
-    <inputSet ref="names"/>
-    <input type="freetext" presence="onTagMatch" category="Naming" name="Reference" key="ref" description="The shortcode/reference for the station" priority="low"/>
-    <input type="freetext" presence="onTagMatch" category="Naming" name="Operator" key="operator" description="The provider of the postal service" priority="low"/>
+
+    <line/>
+    <tag k="railway" v="preserved"/>
   </feature>
-  
-  <feature name="Railway Station">
-    <category>buildings</category>
-    <icon image="features/transport__railway.png">
+
+  <feature name="Disused tracks">
+    <category>transport</category>
+    <icon>
       <font size="14pt"><b>${name}</b></font>
     </icon>
-    
-    <area/>
-    <tag k="building" v="station"/>
-  </feature>
-  
-  <feature name="Railway Platform">
-    <category>transport</category>
-    
-    <line />
-    <area />
-    <tag k="railway" v="platform"/>
-    <input type="freetext" presence="onTagMatch" category="Naming" name="Reference" key="ref" description="The number of the platform" priority="low"/>
+
+    <line/>
+    <tag k="railway" v="disused"/>
   </feature>
-    
-  <!-- Buildings -->
 
-  <feature name="School">
-    <category>buildings</category>
+  <feature name="Old trackbed">
+    <category>transport</category>
     <icon>
-      <b>${name} ${addr:housename}</b><br/>
-      ${addr:housenumber} ${addr:street} ${addr:postcode}
+      <font size="14pt"><b>${name}</b></font>
     </icon>
 
-    <area/>
-    <tag k="amenity" v="school"/>
-    <tag k="building" v="yes"/>
-    <inputSet ref="names"/>
-    <inputSet ref="buildingAddress" />
+    <line/>
+    <tag k="railway" v="abandoned"/>
   </feature>
 
-  <feature name="College">
-    <category>buildings</category>
+  <feature name="Light rail line">
+    <category>transport</category>
+    <icon image="features/transport__tram.png">
+      <font size="14pt"><b>${name}</b></font>
+    </icon>
+
+    <line/>
+    <tag k="railway" v="light_rail"/>
+    <inputSet ref="bridge"/>
+    <inputSet ref="tunnel"/>
+  </feature>
+
+  <feature name="Tram line">
+    <category>transport</category>
+    <icon image="features/transport__tram.png">
+      <font size="14pt"><b>${name}</b></font>
+    </icon>
+
+    <line/>
+    <tag k="railway" v="tram"/>
+    <input ref="tram-route"/>
+    <inputSet ref="bridge"/>
+    <inputSet ref="tunnel"/>
+  </feature>
+
+  <feature name="Subway line">
+    <category>transport</category>
+    <icon image="features/transport__subway.png">
+      <font size="14pt"><b>${name}</b></font>
+    </icon>
+
+    <line/>
+    <tag k="railway" v="subway"/>
+    <inputSet ref="bridge"/>
+    <inputSet ref="tunnel"/>
+  </feature>
+
+  <feature name="Railway platform">
+    <category>transport</category>
+    
+    <line />
+    <area />
+    <tag k="railway" v="platform"/>
+    <input type="freetext" presence="onTagMatch" category="Naming" name="Reference" key="ref" description="The number of the platform" priority="low"/>
+  </feature>
+
+  <feature name="Bus station">
+    <category>transport</category>
+    <icon>
+      <b>${name} ${addr:housename}</b><br/>
+      ${addr:housenumber} ${addr:street} ${addr:postcode}
+    </icon>
+
+    <area/>
+    <tag k="amenity" v="bus_station"/>
+    <tag k="building" v="yes"/>
+    <inputSet ref="names"/>
+    <inputSet ref="buildingAddress" />
+  </feature>
+    
+
+  <!-- ************************************************************************
+       Buildings
+       ************************************************************************ -->
+
+  <feature name="School">
+    <category>buildings</category>
+    <icon>
+      <b>${name} ${addr:housename}</b><br/>
+      ${addr:housenumber} ${addr:street} ${addr:postcode}
+    </icon>
+
+    <area/>
+    <tag k="amenity" v="school"/>
+    <tag k="building" v="yes"/>
+    <inputSet ref="names"/>
+    <inputSet ref="buildingAddress" />
+  </feature>
+
+  <feature name="College">
+    <category>buildings</category>
     <icon>
       <b>${name} ${addr:housename}</b><br/>
       ${addr:housenumber} ${addr:street} ${addr:postcode}
     <inputSet ref="buildingAddress" />
   </feature>
 
-  <feature name="Building">
+  <feature name="Supermarket">
     <category>buildings</category>
     <icon>
       <b>${name} ${addr:housename}</b><br/>
     </icon>
 
     <area/>
-    <tag k="building" v="*"/>
+    <tag k="shop" v="supermarket"/>
+    <tag k="building" v="yes"/>
     <inputSet ref="names"/>
     <inputSet ref="buildingAddress" />
   </feature>
 
-  <!-- Areas -->
+  <feature name="Place of worship">
+    <category>buildings</category>
+    <icon>
+      <b>${name} ${addr:housename}</b><br/>
+      ${addr:housenumber} ${addr:street} ${addr:postcode}
+    </icon>
 
-  <feature name="Park">
-    <category>natural</category>
+    <area/>
+    <tag k="amenity" v="place_of_worship"/>
+    <tag k="building" v="yes"/>
+    <inputSet ref="names"/>
+    <inputSet ref="buildingAddress" />
+  </feature>
+
+  <feature name="Public building">
+    <category>buildings</category>
     <icon>
-      <b>${name}</b><br/>
+      <b>${name} ${addr:housename}</b><br/>
+      ${addr:housenumber} ${addr:street} ${addr:postcode}
     </icon>
 
     <area/>
-    <tag k="leisure" v="park"/>
+    <tag k="amenity" v="public_building"/>
+    <tag k="building" v="yes"/>
+    <inputSet ref="names"/>
+    <inputSet ref="buildingAddress" />
   </feature>
-  
-  <feature name="Forest">
-    <category>natural</category>
+
+  <feature name="Hospital">
+    <category>buildings</category>
     <icon>
-      <b>${name}</b><br/>
+      <b>${name} ${addr:housename}</b><br/>
+      ${addr:housenumber} ${addr:street} ${addr:postcode}
     </icon>
 
     <area/>
-    <tag k="landuse" v="forest"/>
+    <tag k="amenity" v="hospital"/>
+    <tag k="building" v="yes"/>
+    <inputSet ref="names"/>
+    <inputSet ref="buildingAddress" />
   </feature>
-  
-  <!-- POI -->
-  
-  <feature name="Aerodrome">
-    <category>aeroway</category>
-    <icon image="icons/airport.png"/>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:aeroway%3Daerodrome</help>
-    <point />
-    <tag k="aeroway" v="aerodrome"/>
-    <input type="freetext" presence="always" category="" name="name" key="name" description="The name of the aerodrome/airport" priority="low"/>
+
+  <feature name="University">
+    <category>buildings</category>
+    <icon>
+      <b>${name} ${addr:housename}</b><br/>
+      ${addr:housenumber} ${addr:street} ${addr:postcode}
+    </icon>
+
+    <area/>
+    <tag k="amenity" v="university"/>
+    <tag k="building" v="yes"/>
+    <inputSet ref="names"/>
+    <inputSet ref="buildingAddress" />
   </feature>
 
+  <feature name="Attraction">
+    <category>buildings</category>
+    <icon>
+      <b>${name} ${addr:housename}</b><br/>
+      ${addr:housenumber} ${addr:street} ${addr:postcode}
+    </icon>
 
-  <feature name="Cinema">
-    <category>amenity</category>
-    <icon image="icons/cinema.png"/>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dcinema</help>
-    <point />
-    <tag k="amenity" v="cinema"/>
-    <input type="freetext" presence="always" category="" name="name" key="name" description="The name of the cinema" priority="low"/>
+    <area/>
+    <tag k="tourism" v="attraction"/>
+    <tag k="building" v="yes"/>
+    <inputSet ref="names"/>
+    <inputSet ref="buildingAddress" />
   </feature>
 
-  <feature name="Ferry Terminal">
-    <category>amenity</category>
-    <icon image="icons/ferry_terminal.png"/>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dferry_terminal</help>
-    <point />
-    <tag k="amenity" v="ferry_terminal"/>
-    <input type="freetext" presence="always" category="" name="name" key="name" description="The name of the ferry terminal." priority="low"/>
-    <input type="freetext" presence="always" category="" name="Operator" key="operator" description="The operator of the ferry terminal." priority="low"/>
-    <input type="freetext" presence="always" category="" name="Cargo" key="cargo" description="The cargo shipped from here." priority="low"/>
+  <feature name="Museum">
+    <category>buildings</category>
+    <icon>
+      <b>${name} ${addr:housename}</b><br/>
+      ${addr:housenumber} ${addr:street} ${addr:postcode}
+    </icon>
+
+    <area/>
+    <tag k="tourism" v="museum"/>
+    <tag k="building" v="yes"/>
+    <inputSet ref="names"/>
+    <inputSet ref="buildingAddress" />
+  </feature>
+
+  <feature name="Zoo">
+    <category>buildings</category>
+    <icon>
+      <b>${name} ${addr:housename}</b><br/>
+      ${addr:housenumber} ${addr:street} ${addr:postcode}
+    </icon>
+
+    <area/>
+    <tag k="tourism" v="zoo"/>
+    <tag k="building" v="yes"/>
+    <inputSet ref="names"/>
+    <inputSet ref="buildingAddress" />
+  </feature>
+
+  <feature name="Stadium">
+    <category>buildings</category>
+    <icon>
+      <b>${name} ${addr:housename}</b><br/>
+      ${addr:housenumber} ${addr:street} ${addr:postcode}
+    </icon>
+
+    <area/>
+    <tag k="leisure" v="stadium"/>
+    <inputSet ref="names"/>
+    <inputSet ref="buildingAddress" />
+  </feature>
+
+  <feature name="Building">
+    <category>buildings</category>
+    <icon>
+      <b>${name} ${addr:housename}</b><br/>
+      ${addr:housenumber} ${addr:street} ${addr:postcode}
+    </icon>
+
+    <area/>
+    <tag k="building" v="*"/>
+    <inputSet ref="names"/>
+    <inputSet ref="buildingAddress" />
+  </feature>
+
+  <!-- ************************************************************************
+       Landuse
+       ************************************************************************ -->
+
+  <feature name="Industry">
+    <category>landuse</category><area/><icon><b>${name}</b></icon>
+    <tag k="landuse" v="industrial"/>
+    <inputSet ref="simpleName"/>
+  </feature>
+
+  <feature name="Offices">
+    <category>landuse</category><area/><icon><b>${name}</b></icon>
+    <tag k="landuse" v="commercial"/>
+    <inputSet ref="simpleName"/>
+  </feature>
+
+  <feature name="Retail">
+    <category>landuse</category><area/><icon><b>${name}</b></icon>
+    <tag k="landuse" v="retail"/>
+    <inputSet ref="simpleName"/>
+  </feature>
+
+  <feature name="Marketplace">
+    <category>landuse</category><area/><icon><b>${name}</b></icon>
+    <tag k="amenity" v="marketplace"/>
+    <inputSet ref="simpleName"/>
+  </feature>
+
+  <feature name="Cemetery">
+    <category>landuse</category><area/><icon><b>${name}</b></icon>
+    <tag k="landuse" v="cemetery"/>
+    <inputSet ref="simpleName"/>
+  </feature>
+
+  <feature name="Playground">
+    <category>landuse</category><area/><icon><b>${name}</b></icon>
+    <tag k="leisure" v="playground"/>
+    <inputSet ref="simpleName"/>
+  </feature>
+
+  <feature name="Golf course">
+    <category>landuse</category><area/><icon><b>${name}</b></icon>
+    <tag k="leisure" v="golf_course"/>
+    <inputSet ref="simpleName"/>
+  </feature>
+
+  <feature name="Recreation ground">
+    <category>landuse</category><area/><icon><b>${name}</b></icon>
+    <tag k="leisure" v="recreation_ground"/>
+    <inputSet ref="simpleName"/>
   </feature>
 
+  <feature name="Sports pitch">
+    <category>landuse</category><area/><icon><b>${name}</b></icon>
+    <tag k="leisure" v="pitch"/>
+    <inputSet ref="simpleName"/>
+  </feature>
+
+  <feature name="Sports track">
+    <category>landuse</category><area/><icon><b>${name}</b></icon>
+    <tag k="leisure" v="track"/>
+    <inputSet ref="simpleName"/>
+  </feature>
+
+
+  <!-- ************************************************************************
+       POIs
+       ************************************************************************ -->
+
+  <!-- --------- Amenity --------- -->
+
   <feature name="Fire station">
     <category>amenity</category>
-    <icon image="icons/fire_station.png"/>
+    <icon image="features/pois/amenity_firestation2.n.24.png"/>
     <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dfire_station</help>
     <point />
     <tag k="amenity" v="fire_station"/>
     <input type="freetext" presence="always" category="" name="name" key="name" description="The Name of it." priority="low"/>
   </feature>
 
-
   <feature name="Police Station">
     <category>amenity</category>
-    <icon image="icons/police.png"/>
+    <icon image="features/pois/amenity_police2.n.24.png"/>
     <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dpolice</help>
     <point />
     <tag k="amenity" v="police"/>
     <input type="freetext" presence="always" category="" name="name" key="name" description="The Name of it." priority="low"/>
   </feature>
 
-
   <feature name="Hospital">
     <category>amenity</category>
-    <icon image="icons/hospital.png"/>
+    <icon image="features/pois/health_hospital.n.24.png"/>
     <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dhospital</help>
     <point />
     <tag k="amenity" v="hospital"/>
     <input type="freetext" presence="always" category="" name="name" key="name" description="The Name of it." priority="low"/>
   </feature>
 
-  <feature name="Hotel">
-    <category>tourism</category>
-    <icon image="icons/hotel.png"/>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:tourism%3Dhotel</help>
-    <point />
-    <tag k="tourism" v="hotel"/>
-    <input type="freetext" presence="always" category="" name="name" key="name" description="The of it." priority="low"/>
-  </feature>
-
-  <feature name="Museum">
-    <category>tourism</category>
-    <icon image="icons/museum.png"/>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:tourism%3Dmuseum</help>
-    <point />
-    <tag k="tourism" v="museum"/>
-    <input type="freetext" presence="always" category="" name="" key="" description="The name of it." priority="low"/>
-  </feature>
-
   <feature name="Place of Worship">
     <category>amenity</category>
     <icon image="icons/place_of_worship.png"/>
     <input type="freetext" presence="always" category="" name="denomination" key="denomination" description="The denomination of the religion worshiped here." priority="low"/>
   </feature>
 
-
-
-
-
-
-
-
-
   <feature name="ATM">
     <category>amenity</category>
-    <icon image="icons/atm.png"/>
+    <icon image="features/pois/money_atm.n.24.png"/>
     <help>http://wiki.openstreetmap.org/wiki/Atm</help>
     <point />
     <tag k="amenity" v="atm"/>
   
   <feature name="Bank">
     <category>amenity</category>
-    <icon image="icons/bank.png">
+    <icon image="features/pois/money_bank2.n.24.png">
       ${name}
     </icon>
     <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dbank</help>
   
   <feature name="Recycling">
     <category>amenity</category>
-    <icon image="icons/recycling.png"/>
+    <icon image="features/pois/amenity_recycling.n.24.png"/>
     <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Drecycling</help>
     <point />
     <tag k="amenity" v="recycling"/>
   
   <feature name="School">
     <category>amenity</category>
-    <icon image="icons/school.png">
+    <icon image="features/pois/education_school.n.24.png">
       ${name}
     </icon>
     <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dschool</help>
     <point />
-    <area />
     <tag k="amenity" v="school"/>
     <inputSet ref="names"/>
     <inputSet ref="buildingAddress"/>
   </feature>
   
-  <!-- transportation -->
+  <feature name="Post Box">
+    <category>amenity</category>
+    <icon image="features/pois/amenity_post_box.n.24.png">
+      ${ref}
+    </icon>
+    <help>http://wiki.openstreetmap.org/wiki/Post_box</help>
+    <point />
+    <tag k="amenity" v="post_box"/>
+    <input type="freetext" presence="always" category="Naming" name="Ref" key="ref" description="Reference number of the post box" />
+    <input type="freetext" presence="always" category="Naming" name="Operator" key="operator" description="The provider of the postal service" priority="low"/>
+  </feature>
+  
+  <!-- --------- Tourism --------- -->
+
+  <feature name="Hotel">
+    <category>tourism</category>
+    <icon image="features/pois/accommodation_hotel.n.24.png"/>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:tourism%3Dhotel</help>
+    <point />
+    <tag k="tourism" v="hotel"/>
+    <inputSet ref="simpleName" />
+  </feature>
+
+  <feature name="Hostel">
+    <category>tourism</category><point /><inputSet ref="simpleName" />
+       <icon image="features/pois/accommodation_youth_hostel.n.24.png"/>
+    <tag k="tourism" v="hostel"/>
+  </feature>
+
+  <feature name="Guesthouse (B&B)">
+    <category>tourism</category><point /><inputSet ref="simpleName" />
+       <icon image="features/pois/accommodation_bed_and_breakfast.n.24.png"/>
+    <tag k="tourism" v="guesthouse"/>
+  </feature>
+
+  <feature name="Campsite">
+    <category>tourism</category><point /><inputSet ref="simpleName" />
+       <icon image="features/pois/accommodation_camping.n.24.png"/>
+    <tag k="tourism" v="camp_site"/>
+  </feature>
+
+  <feature name="Caravan park">
+    <category>tourism</category><point /><inputSet ref="simpleName" />
+       <icon image="features/pois/accommodation_caravan_park.n.24.png"/>
+    <tag k="tourism" v="caravan_site"/>
+  </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 />
+    <tag k="tourism" v="museum"/>
+    <inputSet ref="simpleName" />
+  </feature>
+
+  <feature name="Archaeological">
+    <category>tourism</category><point /><inputSet ref="simpleName" />
+       <icon image="features/pois/tourist_archaeological.n.24.png"/>
+    <tag k="historic" v="archaeological_site"/>
+  </feature>
+
+  <feature name="Battlefield">
+    <category>tourism</category><point /><inputSet ref="simpleName" />
+       <icon image="features/pois/tourist_battlefield.n.24.png"/>
+    <tag k="historic" v="battlefield"/>
+  </feature>
+
+  <feature name="Castle">
+    <category>tourism</category><point /><inputSet ref="simpleName" />
+       <icon image="features/pois/tourist_castle.n.24.png"/>
+    <tag k="historic" v="castle"/>
+  </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"/>
+  </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"/>
+  </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"/>
+  </feature>
+
+  <feature name="Ruin">
+    <category>tourism</category><point /><inputSet ref="simpleName" />
+       <icon image="features/pois/tourist_ruin.n.24.png"/>
+    <tag k="historic" v="ruin"/>
+  </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 />
+    <tag k="amenity" v="cinema"/>
+    <input type="freetext" presence="always" category="" name="name" key="name" description="The name of the cinema" priority="low"/>
+  </feature>
+
+  <feature name="Theatre">
+    <category>tourism</category><point /><inputSet ref="simpleName" />
+       <icon image="features/pois/tourist_ruin.n.24.png"/>
+    <tag k="amenity" v="theatre"/>
+  </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"/>
+  </feature>
+
+  <feature name="Viewpoint">
+    <category>tourism</category><point /><inputSet ref="simpleName" />
+       <icon image="features/pois/tourist_zoo.n.24.png"/>
+    <tag k="tourism" v="zoo"/>
+  </feature>
+
+  <!-- --------- Transport --------- -->
+
+  <feature name="Aerodrome">
+    <category>aeroway</category>
+    <icon image="features/pois/transport_aerodrome.n.24.png"/>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:aeroway%3Daerodrome</help>
+    <point />
+    <tag k="aeroway" v="aerodrome"/>
+    <input type="freetext" presence="always" category="" name="name" key="name" description="The name of the aerodrome/airport" priority="low"/>
+  </feature>
+
   <feature name="Bus Stop">
     <category>transport</category>
-    <icon image="features/transport__bus.png">
+    <icon image="features/pois/transport_bus_stop2.n.24.png">
       ${name} ${local_ref}
     </icon>
     <point />
   
   <feature name="Car Parking">
     <category>transport</category>
-    <icon image="icons/parking.png">
+    <icon image="features/pois/transport_parking_car.n.24.png">
       ${name}
     </icon>
     <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dparking</help>
   
   <feature name="Bicycle Parking">
     <category>transport</category>
-    <icon image="icons/parking_cycle.png">
+    <icon image="features/pois/transport_parking_bicycle.n.24.png">
       ${name} ${capacity}
     </icon>
     <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dbicycle_parking</help>
     </input>
   </feature>
   
-  <!-- eating places/entertainment -->
+  <feature name="Railway station">
+    <category>transport</category>
+    <icon image="features/pois/transport_train_station.n.24.png">
+      <font size="14pt"><b>${name}</b></font>
+    </icon>
+    
+    <point/>
+    <tag k="railway" v="station"/>
+    <inputSet ref="names"/>
+    <input type="freetext" presence="onTagMatch" category="Naming" name="Reference" key="ref" description="The shortcode/reference for the station" priority="low"/>
+    <input type="freetext" presence="onTagMatch" category="Naming" name="Operator" key="operator" description="The provider of the service" priority="low"/>
+  </feature>
+
+  <feature name="Fuel">
+    <category>transport</category><point /><inputSet ref="simpleName" />
+       <icon image="features/pois/transport_fuel.n.24.png"/>
+    <tag k="amenity" v="fuel"/>
+  </feature>
+  
+  <feature name="Bus station">
+    <category>transport</category><point /><inputSet ref="simpleName" />
+       <icon image="features/pois/transport_bus_station.n.24.png"/>
+    <tag k="amenity" v="bus_station"/>
+  </feature>
+  
+  <feature name="Taxi rank">
+    <category>transport</category><point /><inputSet ref="simpleName" />
+       <icon image="features/pois/transport_taxi_rank.n.24.png"/>
+    <tag k="amenity" v="taxi"/>
+  </feature>
+
+  <feature name="Tram stop">
+    <category>transport</category><point /><inputSet ref="simpleName" />
+       <icon image="features/pois/transport_tram_stop.n.24.png"/>
+    <tag k="railway" v="tram_stop"/>
+  </feature>
+  
+  <feature name="Bicycle rental">
+    <category>transport</category><point /><inputSet ref="simpleName" />
+       <icon image="features/pois/transport_rental_bicycle.n.24.png"/>
+    <tag k="amenity" v="bicycle_rental"/>
+  </feature>
+
+  <feature name="Car rental">
+    <category>transport</category><point /><inputSet ref="simpleName" />
+       <icon image="features/pois/transport_rental_car.n.24.png"/>
+    <tag k="amenity" v="car_rental"/>
+  </feature>
+  
+  <feature name="Ferry Terminal">
+    <category>transport</category>
+    <icon image="features/pois/transport_port.n.24.png"/>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dferry_terminal</help>
+    <point />
+    <tag k="amenity" v="ferry_terminal"/>
+    <input type="freetext" presence="always" category="" name="name" key="name" description="The name of the ferry terminal." priority="low"/>
+    <input type="freetext" presence="always" category="" name="Operator" key="operator" description="The operator of the ferry terminal." priority="low"/>
+    <input type="freetext" presence="always" category="" name="Cargo" key="cargo" description="The cargo shipped from here." priority="low"/>
+  </feature>
+
+  <!-- --------- Barriers --------- -->
+
+  <feature name="Bollard">
+    <category>barrier</category>
+    <icon image="features/pois/barrier_bollard.n.24.png">
+    </icon>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dbollard</help>
+    
+    <point />
+    <tag k="barrier" v="bollard"/>
+  </feature>
+  
+  <feature name="Gate">
+    <category>barrier</category>
+    <icon image="features/pois/barrier_gate.n.24.png">
+    </icon>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dgate</help>
+    
+    <point />
+    <tag k="barrier" v="gate"/>
+  </feature>
+  
+  <feature name="Cycle Barrier">
+    <category>barrier</category>
+    <icon image="features/pois/barrier_bollard.n.24.png">
+    </icon>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dcycle_barrier</help>
+    
+    <point />
+    <tag k="barrier" v="cycle_barrier"/>
+  </feature>
+  
+  <feature name="Big Concrete Blocks">
+    <category>barrier</category>
+    <icon image="features/pois/barrier_bollard.n.24.png">
+    </icon>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dblock</help>
+    
+    <point />
+    <tag k="barrier" v="block"/>
+  </feature>
+  
+  <feature name="Cattle Grid">
+    <category>barrier</category>
+    <icon image="icons/cattle_grid.png">
+    </icon>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dcattle_grid</help>
+    
+    <point />
+    <tag k="barrier" v="cattle_grid"/>
+  </feature>
+  
+  <feature name="Toll Booth">
+    <category>barrier</category>
+    <icon image="features/pois/barrier_toll_booth.n.24.png">
+    </icon>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dtoll_booth</help>
+    
+    <point />
+    <tag k="barrier" v="toll_booth"/>
+    <tagSet ref="fee"/>
+    <input type="freetext" presence="onTagMatch" category="Naming" name="Operator" key="operator" description="The provider of the toll" priority="low"/>
+  </feature>
+  
+  <!-- --------- Entertainment --------- -->
   
   <feature name="Pub">
     <category>entertainment</category>
-    <icon image="icons/pub.png">
+    <icon image="features/pois/food_pub.n.24.png">
       ${name}
     </icon>
     <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dpub</help>
 
   <feature name="Bar">
     <category>entertainment</category>
-    <icon image="icons/bar.png">
+    <icon image="features/pois/food_bar.n.24.png">
       ${name}
     </icon>
     <point />
 
   <feature name="Restaurant">
     <category>entertainment</category>
-    <icon image="icons/restaurant.png">
+    <icon image="features/pois/food_restaurant.n.24.png">
       ${name}
     </icon>
     <point />
   
   <feature name="Cafe">
     <category>entertainment</category>
-    <icon image="icons/cafe.png">
+    <icon image="features/pois/food_cafe.n.24.png">
       ${name}
     </icon>
     <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dcafe</help>
   
   <feature name="Fast Food">
     <category>entertainment</category>
-    <icon image="icons/fast_food.png">
+    <icon image="features/pois/food_fastfood.n.24.png">
       ${name}
     </icon>
     <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dfast_food</help>
     <inputSet ref="cuisine"/>
   </feature>
 
-  <feature name="Post Box">
-    <category>amenity</category>
-    <icon image="icons/post_box.png">
-      ${ref}
-    </icon>
-    <help>http://wiki.openstreetmap.org/wiki/Post_box</help>
-    <point />
-    <tag k="amenity" v="post_box"/>
-    <input type="freetext" presence="always" category="Naming" name="Ref" key="ref" description="Reference number of the post box" />
-    <input type="freetext" presence="always" category="Naming" name="Operator" key="operator" description="The provider of the postal service" priority="low"/>
-  </feature>
-  
-  <!-- shops -->
-  <feature name="Small Convience Store">
+  <!-- --------- Shops --------- -->
+
+  <feature name="Small Convenience Store">
     <category>shopping</category>
-    <icon image="icons/convenience.png">
+    <icon image="features/pois/shopping_convenience.n.24.png">
       ${name}
     </icon>
     <help>http://wiki.openstreetmap.org/wiki/Tag:shop%3Dconvenience</help>
   
   <feature name="Supermarket">
     <category>shopping</category>
-    <icon image="icons/supermarket.png">
+    <icon image="features/pois/shopping_supermarket.n.24.png">
       ${name}
     </icon>
     <help>http://wiki.openstreetmap.org/wiki/Tag:shop%3Dsupermarket</help>
     <inputSet ref="names"/>
     <inputSet ref="buildingAddress"/>
   </feature>
-  
+  <feature name="Alcohol shop">
+    <category>shopping</category><point /><inputSet ref="simpleName" /><inputSet ref="buildingAddress"/>
+       <icon image="features/pois/shopping_alcohol.n.24.png"/>
+    <tag k="shop" v="alcohol"/>
+  </feature>
+
+  <feature name="Bakery">
+    <category>shopping</category><point /><inputSet ref="simpleName" /><inputSet ref="buildingAddress"/>
+       <icon image="features/pois/shopping_bakery.n.24.png"/>
+    <tag k="shop" v="bakery"/>
+  </feature>
+
+  <feature name="Bike shop">
+    <category>shopping</category><point /><inputSet ref="simpleName" /><inputSet ref="buildingAddress"/>
+       <icon image="features/pois/shopping_bicycle.n.24.png"/>
+    <tag k="shop" v="bicycle"/>
+  </feature>
+
+  <feature name="Bookshop">
+    <category>shopping</category><point /><inputSet ref="simpleName" /><inputSet ref="buildingAddress"/>
+       <icon image="features/pois/shopping_book.n.24.png"/>
+    <tag k="shop" v="book"/>
+  </feature>
+
+  <feature name="Butcher">
+    <category>shopping</category><point /><inputSet ref="simpleName" /><inputSet ref="buildingAddress"/>
+       <icon image="features/pois/shopping_butcher.n.24.png"/>
+    <tag k="shop" v="butcher"/>
+  </feature>
+
+  <feature name="Car repair">
+    <category>shopping</category><point /><inputSet ref="simpleName" /><inputSet ref="buildingAddress"/>
+       <icon image="features/pois/shopping_car_repair.n.24.png"/>
+    <tag k="shop" v="car_repair"/>
+  </feature>
+
+  <feature name="Clothes shop">
+    <category>shopping</category><point /><inputSet ref="simpleName" /><inputSet ref="buildingAddress"/>
+       <icon image="features/pois/shopping_clothes.n.24.png"/>
+    <tag k="shop" v="clothes"/>
+  </feature>
+
+  <feature name="Confectionery">
+    <category>shopping</category><point /><inputSet ref="simpleName" /><inputSet ref="buildingAddress"/>
+       <icon image="features/pois/shopping_confectionery.n.24.png"/>
+    <tag k="shop" v="confectionery"/>
+  </feature>
+
+  <feature name="DIY">
+    <category>shopping</category><point /><inputSet ref="simpleName" /><inputSet ref="buildingAddress"/>
+       <icon image="features/pois/shopping_diy.n.24.png"/>
+    <tag k="shop" v="doityourself"/>
+  </feature>
+
+  <feature name="Fishmonger">
+    <category>shopping</category><point /><inputSet ref="simpleName" /><inputSet ref="buildingAddress"/>
+       <icon image="features/pois/shopping_fish.n.24.png"/>
+    <tag k="shop" v="fishmonger"/>
+  </feature>
+
+  <feature name="Garden centre">
+    <category>shopping</category><point /><inputSet ref="simpleName" /><inputSet ref="buildingAddress"/>
+       <icon image="features/pois/shopping_garden_centre.n.24.png"/>
+    <tag k="shop" v="garden_centre"/>
+  </feature>
+
+  <feature name="Gift shop">
+    <category>shopping</category><point /><inputSet ref="simpleName" /><inputSet ref="buildingAddress"/>
+       <icon image="features/pois/shopping_gift.n.24.png"/>
+    <tag k="shop" v="gift"/>
+  </feature>
+
+  <feature name="Greengrocer">
+    <category>shopping</category><point /><inputSet ref="simpleName" /><inputSet ref="buildingAddress"/>
+       <icon image="features/pois/shopping_greengrocer.n.24.png"/>
+    <tag k="shop" v="greengrocer"/>
+  </feature>
+
+  <feature name="Hairdresser">
+    <category>shopping</category><point /><inputSet ref="simpleName" /><inputSet ref="buildingAddress"/>
+       <icon image="features/pois/shopping_hairdresser.n.24.png"/>
+    <tag k="shop" v="hairdresser"/>
+  </feature>
+
+  <feature name="Hifi shop">
+    <category>shopping</category><point /><inputSet ref="simpleName" /><inputSet ref="buildingAddress"/>
+       <icon image="features/pois/shopping_hifi.n.24.png"/>
+    <tag k="shop" v="hifi"/>
+  </feature>
+
+  <feature name="Jewellery">
+    <category>shopping</category><point /><inputSet ref="simpleName" /><inputSet ref="buildingAddress"/>
+       <icon image="features/pois/shopping_jewelry.n.24.png"/>
+    <tag k="shop" v="jewelry"/>
+  </feature>
+
+  <feature name="Launderette">
+    <category>shopping</category><point /><inputSet ref="simpleName" /><inputSet ref="buildingAddress"/>
+       <icon image="features/pois/shopping_laundrette.n.24.png"/>
+    <tag k="shop" v="laundry"/>
+  </feature>
+
+  <feature name="Motorbike shop">
+    <category>shopping</category><point /><inputSet ref="simpleName" /><inputSet ref="buildingAddress"/>
+       <icon image="features/pois/shopping_motorcycle.n.24.png"/>
+    <tag k="shop" v="motorcycle"/>
+  </feature>
+
+  <feature name="Music shop">
+    <category>shopping</category><point /><inputSet ref="simpleName" /><inputSet ref="buildingAddress"/>
+       <icon image="features/pois/shopping_music.n.24.png"/>
+    <tag k="shop" v="music"/>
+  </feature>
+
   <feature name="Pharmacy">
     <category>shopping</category>
-    <icon image="icons/pharmacy.png">
+    <icon image="features/pois/health_pharmacy.n.24.png">
       ${name}
     </icon>
     <help>http://wiki.openstreetmap.org/wiki/Pharmacy</help>
     <input type="checkbox" category="Amenity" presence="always" description="Does this pharmacy sell prescription drugs?" name="Dispensing" key="dispensing" layout="horizontal"/>
   </feature>
 
-  <!-- advanced relations -->
+
+  <!-- ************************************************************************
+       Relations
+       ************************************************************************ -->
+
   <feature name="Turn restriction">
     <category>advanced</category>
     <help>http://wiki.openstreetmap.org/wiki/Turn_restrictions</help>