diff --git a/resources/features/aeroway__runway.png b/resources/features/aeroway__runway.png new file mode 100644 index 00000000..bbac49e8 Binary files /dev/null and b/resources/features/aeroway__runway.png differ diff --git a/resources/features/aeroway__taxiway.png b/resources/features/aeroway__taxiway.png new file mode 100644 index 00000000..a5eda4d6 Binary files /dev/null and b/resources/features/aeroway__taxiway.png differ diff --git a/resources/features/paths__unofficial.png b/resources/features/paths__unofficial.png new file mode 100644 index 00000000..fa428df5 Binary files /dev/null and b/resources/features/paths__unofficial.png differ diff --git a/resources/features/pois/barrier_generic.svg b/resources/features/pois/barrier_generic.svg deleted file mode 100644 index 2473955d..00000000 --- a/resources/features/pois/barrier_generic.svg +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - - - - - - - image/svg+xml - - - - - - - - - diff --git a/resources/features/railway__abandoned.png b/resources/features/railway__abandoned.png new file mode 100644 index 00000000..3b7a02ed Binary files /dev/null and b/resources/features/railway__abandoned.png differ diff --git a/resources/features/railway__disused.png b/resources/features/railway__disused.png new file mode 100644 index 00000000..2b24f69a Binary files /dev/null and b/resources/features/railway__disused.png differ diff --git a/resources/features/railway__light.png b/resources/features/railway__light.png new file mode 100644 index 00000000..0e2eca7c Binary files /dev/null and b/resources/features/railway__light.png differ diff --git a/resources/features/railway__platform.png b/resources/features/railway__platform.png new file mode 100644 index 00000000..e6d59197 Binary files /dev/null and b/resources/features/railway__platform.png differ diff --git a/resources/features/railway__preserved.png b/resources/features/railway__preserved.png new file mode 100644 index 00000000..28d4f5cc Binary files /dev/null and b/resources/features/railway__preserved.png differ diff --git a/resources/features/railway__rail.png b/resources/features/railway__rail.png new file mode 100644 index 00000000..0aa4e66d Binary files /dev/null and b/resources/features/railway__rail.png differ diff --git a/resources/features/railway__siding.png b/resources/features/railway__siding.png new file mode 100644 index 00000000..9519ee0a Binary files /dev/null and b/resources/features/railway__siding.png differ diff --git a/resources/features/railway__spur.png b/resources/features/railway__spur.png new file mode 100644 index 00000000..4cde3d8e Binary files /dev/null and b/resources/features/railway__spur.png differ diff --git a/resources/features/railway__subway.png b/resources/features/railway__subway.png new file mode 100644 index 00000000..7e13bd02 Binary files /dev/null and b/resources/features/railway__subway.png differ diff --git a/resources/features/railway__tram.png b/resources/features/railway__tram.png new file mode 100644 index 00000000..2940c7a8 Binary files /dev/null and b/resources/features/railway__tram.png differ diff --git a/resources/features/waterway__basin.png b/resources/features/waterway__basin.png new file mode 100644 index 00000000..29798db2 Binary files /dev/null and b/resources/features/waterway__basin.png differ diff --git a/resources/features/waterway__coastline.png b/resources/features/waterway__coastline.png new file mode 100644 index 00000000..2239eb09 Binary files /dev/null and b/resources/features/waterway__coastline.png differ diff --git a/resources/features/waterway__dock.png b/resources/features/waterway__dock.png new file mode 100644 index 00000000..e6e40d1f Binary files /dev/null and b/resources/features/waterway__dock.png differ diff --git a/resources/features/waterway__lake.png b/resources/features/waterway__lake.png new file mode 100644 index 00000000..275bb572 Binary files /dev/null and b/resources/features/waterway__lake.png differ diff --git a/resources/features/waterway__marina.png b/resources/features/waterway__marina.png new file mode 100644 index 00000000..3704b001 Binary files /dev/null and b/resources/features/waterway__marina.png differ diff --git a/resources/features/waterway__reservoir.png b/resources/features/waterway__reservoir.png new file mode 100644 index 00000000..bd118e6d Binary files /dev/null and b/resources/features/waterway__reservoir.png differ diff --git a/resources/features/waterway__riverbank.png b/resources/features/waterway__riverbank.png new file mode 100644 index 00000000..7152808d Binary files /dev/null and b/resources/features/waterway__riverbank.png differ diff --git a/resources/icons/health_pharmacy.n.16.png b/resources/icons/health_pharmacy.n.16.png index ffc12561..1827b0a6 100644 Binary files a/resources/icons/health_pharmacy.n.16.png and b/resources/icons/health_pharmacy.n.16.png differ diff --git a/resources/map_features/paths.xml b/resources/map_features/paths.xml index 33057657..c182cdf7 100644 --- a/resources/map_features/paths.xml +++ b/resources/map_features/paths.xml @@ -1,166 +1,165 @@ - - - paths - - ${name} ${ref} - - http://wiki.openstreetmap.org/wiki/Tag:highway%3Dfootway - - - - - - - - - paths - - ${name} ${ncn_ref} ${rcn_ref} ${lcn_ref} ${ref} - - http://wiki.openstreetmap.org/wiki/Tag:highway%3Dcycleway - - - - - - - - - paths - - ${name} ${ncn_ref} ${rcn_ref} ${lcn_ref} ${ref} - - http://wiki.openstreetmap.org/wiki/Tag:highway%3Dpath - - - - - - - - - - - paths - - - ${name} - - - - - - - - - - - - - - - - - - - - paths - - - - - - - - - - - - paths - - - http://wiki.openstreetmap.org/wiki/Tag:highway%3Dsteps - - - - - - - - - - - - paths - - - ${ref} - -
- ${name} - - - - - - - - - - - - - paths - - ${ref}
- ${name} - - - - - - - - - - - - - paths - - - ${ref} - -
- ${name} - - - - - - - - - - - - - - paths - - - ${ref} - -
- ${name} - - - - - - - - - - + + + paths + + ${name} ${ref} + + http://wiki.openstreetmap.org/wiki/Tag:highway%3Dfootway + + + + + + + + + paths + + ${name} ${ncn_ref} ${rcn_ref} ${lcn_ref} ${ref} + + http://wiki.openstreetmap.org/wiki/Tag:highway%3Dcycleway + + + + + + + + + paths + + + ${name} + + + + + + + + + + + + + + + + + + + + paths + + + + + + + + + + + + paths + + + http://wiki.openstreetmap.org/wiki/Tag:highway%3Dsteps + + + + + + + + + + paths + + ${name} ${ncn_ref} ${rcn_ref} ${lcn_ref} ${ref} + + http://wiki.openstreetmap.org/wiki/Tag:highway%3Dpath + + + + + + + + + + + + paths + + + ${ref} + +
+ ${name} + + + + + + + + + + + + + paths + + ${ref}
+ ${name} + + + + + + + + + + + + + paths + + + ${ref} + +
+ ${name} + + + + + + + + + + + + + + paths + + + ${ref} + +
+ ${name} + + + + + + + + + + \ No newline at end of file diff --git a/resources/map_features/transport.xml b/resources/map_features/transport.xml index 91df3df3..29ddc16c 100644 --- a/resources/map_features/transport.xml +++ b/resources/map_features/transport.xml @@ -1,480 +1,480 @@ - - - transport - - - ${name} - - - - - - - - - - - - - - - - transport - - - ${name} - - - - - - - - - - - - transport - - - ${name} - - - - - - - - - - - - transport - - ${name} - - - - - - - - - - transport - - - ${name} - - - - - - - - - - - transport - - ${name} - - - - - - - - - - transport - - - ${name} - - - - - - - - - - - - - - - transport - - ${name} - - - - - - - - - - - - - - - transport - - - ${name} - - - - - - - - - - - - - - - transport - - - - - - - - - - - transport - - ${name} ${addr:housename}
- ${addr:housenumber} ${addr:street} ${addr:postcode} - - - - - - - - - - - - - transport - - - - - - - http://wiki.openstreetmap.org/wiki/Key:aeroway - - - - - - transport - - - - - - http://wiki.openstreetmap.org/wiki/Key:aeroway - - - - - - transport - - - - - - http://wiki.openstreetmap.org/wiki/Key:aeroway - - - - - - transport - - - - - - http://wiki.openstreetmap.org/wiki/Key:aeroway - - - - - - transport - - - - - - http://wiki.openstreetmap.org/wiki/Key:aeroway - - - - - - transport - - - - - http://wiki.openstreetmap.org/wiki/Key:aeroway - - - - - - transport - - - - - http://wiki.openstreetmap.org/wiki/Key:aeroway - - - - - - aeroway - - http://wiki.openstreetmap.org/wiki/Tag:aeroway%3Daerodrome - - - - - - - - - transport - - ${name} ${local_ref} - - - - - - - - - - transport - - ${name} - - http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dparking - - - - - - - - - - - - - transport - - ${name} ${capacity} - - http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dbicycle_parking - - - - - - - - - - - - - - - - transport - - - ${name} - - - - - - - - - - - - - - transport - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - transport - - - - - - - - - - transport - - - - - - - - - - transport - - - - - - - - transport - - - - - - - - - - transport - - - - - - - - - - transport - - http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dferry_terminal - - - - - - - - - - - - transport - - - ${operator} ${ref} - - - - - - - - - - - - - - - - transport - - - ${operator} ${reg} - - - - - - - - - - - - - - + + + transport + + + ${name} + + + + + + + + + + + + + + + + transport + + + ${name} + + + + + + + + + + + + transport + + + ${name} + + + + + + + + + + + + transport + + ${name} + + + + + + + + + + transport + + + ${name} + + + + + + + + + + + transport + + ${name} + + + + + + + + + + transport + + + ${name} + + + + + + + + + + + + + + + transport + + ${name} + + + + + + + + + + + + + + + transport + + + ${name} + + + + + + + + + + + + + + + transport + + + + + + + + + + + transport + + ${name} ${addr:housename}
+ ${addr:housenumber} ${addr:street} ${addr:postcode} + + + + + + + + + + + + + transport + + + + + + + http://wiki.openstreetmap.org/wiki/Key:aeroway + + + + + + transport + + + + + + http://wiki.openstreetmap.org/wiki/Key:aeroway + + + + + + transport + + + + + + http://wiki.openstreetmap.org/wiki/Key:aeroway + + + + + + transport + + + + + + http://wiki.openstreetmap.org/wiki/Key:aeroway + + + + + + transport + + + + + + http://wiki.openstreetmap.org/wiki/Key:aeroway + + + + + + transport + + + + + http://wiki.openstreetmap.org/wiki/Key:aeroway + + + + + + transport + + + + + http://wiki.openstreetmap.org/wiki/Key:aeroway + + + + + + aeroway + + http://wiki.openstreetmap.org/wiki/Tag:aeroway%3Daerodrome + + + + + + + + + transport + + ${name} ${local_ref} + + + + + + + + + + transport + + ${name} + + http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dparking + + + + + + + + + + + + + transport + + ${name} ${capacity} + + http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dbicycle_parking + + + + + + + + + + + + + + + + transport + + + ${name} + + + + + + + + + + + + + + transport + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + transport + + + + + + + + + + transport + + + + + + + + + + transport + + + + + + + + transport + + + + + + + + + + transport + + + + + + + + + + transport + + http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dferry_terminal + + + + + + + + + + + + transport + + + ${operator} ${ref} + + + + + + + + + + + + + + + + transport + + + ${operator} ${reg} + + + + + + + + + + + + + + \ No newline at end of file diff --git a/resources/map_features/water.xml b/resources/map_features/water.xml index 1787c9e6..86e3888e 100644 --- a/resources/map_features/water.xml +++ b/resources/map_features/water.xml @@ -1,206 +1,207 @@ - - - water - A very narrow river. - - - ${name} - - - - - - - - - - - - water - - ${name} - - - - - - - - - - - water - - - ${name} - - - - - - - - - - - - - water - - ${name} - - - - - - - - - - - - barrier - - - ${name} - - - - - - - - - - - - water - - ${name} - - - - - - - - - - water - - - ${name} - - - - - - - - - - - - water - - - ${name} - - - - - - - - - - - - water - - - ${name} - - - - - - - - - - - - water - - - ${name} - - - - - - - - - - - - - - water - - - ${name} - - - - - - - - - - - - water - - - ${name} - - - - - - - - - - - - - water - - - - - - - - - water - - - - - - - - - - water - - - - + + + water + A very narrow river. + + + ${name} + + + + + + + + + + + + water + + ${name} + + + + + + + + + + + water + + + ${name} + + + + + + + + + + + + + water + + ${name} + + + + + + + + + + + + barrier + + + ${name} + + + + + + + + + + + + water + + ${name} + + + + + + + + + + water + + + ${name} + + + + + + + + + + + + water + + + ${name} + + + + + + + + + + + + water + + + ${name} + + + + + + + + + + + + water + + + ${name} + + + + + + + + + + + + + + water + + + ${name} + + + + + + + + + + + + water + + + ${name} + + + + + + + + + + + + + water + + + + + + + + + water + + + + + + + + + + water + + + + + \ No newline at end of file diff --git a/resources/features/pois/amenity_vendingmachine.svg b/resources_src/amenity_vendingmachine.svg similarity index 100% rename from resources/features/pois/amenity_vendingmachine.svg rename to resources_src/amenity_vendingmachine.svg diff --git a/resources/features/barrier_generic.svg b/resources_src/barrier_generic.svg similarity index 100% rename from resources/features/barrier_generic.svg rename to resources_src/barrier_generic.svg diff --git a/resources/features/manmade_lighthouse.svg b/resources_src/manmade_lighthouse.svg similarity index 100% rename from resources/features/manmade_lighthouse.svg rename to resources_src/manmade_lighthouse.svg diff --git a/resources/features/manmade_silo.svg b/resources_src/manmade_silo.svg similarity index 100% rename from resources/features/manmade_silo.svg rename to resources_src/manmade_silo.svg diff --git a/resources/features/manmade_tower.svg b/resources_src/manmade_tower.svg similarity index 100% rename from resources/features/manmade_tower.svg rename to resources_src/manmade_tower.svg diff --git a/resources/features/pois/miniroundabout.svg b/resources_src/miniroundabout.svg similarity index 100% rename from resources/features/pois/miniroundabout.svg rename to resources_src/miniroundabout.svg diff --git a/resources/features/power_high.svg b/resources_src/power_high.svg similarity index 100% rename from resources/features/power_high.svg rename to resources_src/power_high.svg diff --git a/resources/features/power_low.svg b/resources_src/power_low.svg similarity index 100% rename from resources/features/power_low.svg rename to resources_src/power_low.svg diff --git a/resources/features/pois/power_station.svg b/resources_src/power_station.svg similarity index 100% rename from resources/features/pois/power_station.svg rename to resources_src/power_station.svg diff --git a/resources/features/transport__railway.svg b/resources_src/transport__railway.svg similarity index 100% rename from resources/features/transport__railway.svg rename to resources_src/transport__railway.svg diff --git a/resources/features/transport__subway.svg b/resources_src/transport__subway.svg similarity index 100% rename from resources/features/transport__subway.svg rename to resources_src/transport__subway.svg diff --git a/resources/features/transport__tram.svg b/resources_src/transport__tram.svg similarity index 100% rename from resources/features/transport__tram.svg rename to resources_src/transport__tram.svg diff --git a/resources/features/pois/water_generic.svg b/resources_src/water_generic.svg similarity index 100% rename from resources/features/pois/water_generic.svg rename to resources_src/water_generic.svg diff --git a/resources_src/way_icons.ai b/resources_src/way_icons.ai new file mode 100644 index 00000000..a9abe432 Binary files /dev/null and b/resources_src/way_icons.ai differ