diff --git a/css/feature-icons.css b/css/feature-icons.css index f88819fd6..fb1112d14 100644 --- a/css/feature-icons.css +++ b/css/feature-icons.css @@ -1,4 +1,4 @@ -/* glue: 0.3 hash: 41b60c57fa */ +/* glue: 0.3 hash: a9f9bb5536 */ .feature-waterway-stream, .feature-waterway-river, .feature-waterway-ditch, @@ -10,6 +10,7 @@ .feature-railway-disused, .feature-railway-abandoned, .feature-power-line, +.feature-other-line, .feature-highway-unclassified, .feature-highway-trunk, .feature-highway-trunk-link, @@ -30,6 +31,7 @@ .feature-highway-footway, .feature-highway-cycleway, .feature-highway-bridleway, +.feature-category-roads, .feature-zoo, .feature-x, .feature-wetland, @@ -299,282 +301,284 @@ .feature-railway-disused{background-position:-120px -120px;width:60px;height:60px;} .feature-railway-abandoned{background-position:-180px 0px;width:60px;height:60px;} .feature-power-line{background-position:-180px -60px;width:60px;height:60px;} -.feature-highway-unclassified{background-position:-180px -120px;width:60px;height:60px;} -.feature-highway-trunk{background-position:0px -180px;width:60px;height:60px;} -.feature-highway-trunk-link{background-position:-60px -180px;width:60px;height:60px;} -.feature-highway-track{background-position:-120px -180px;width:60px;height:60px;} -.feature-highway-tertiary:link{background-position:-180px -180px;width:60px;height:60px;} -.feature-highway-tertiary{background-position:-240px 0px;width:60px;height:60px;} -.feature-highway-steps{background-position:-240px -60px;width:60px;height:60px;} -.feature-highway-service{background-position:-240px -120px;width:60px;height:60px;} -.feature-highway-secondary{background-position:-240px -180px;width:60px;height:60px;} -.feature-highway-secondary-link{background-position:0px -240px;width:60px;height:60px;} -.feature-highway-road{background-position:-60px -240px;width:60px;height:60px;} -.feature-highway-residential{background-position:-120px -240px;width:60px;height:60px;} -.feature-highway-primary{background-position:-180px -240px;width:60px;height:60px;} -.feature-highway-primary-link{background-position:-240px -240px;width:60px;height:60px;} -.feature-highway-path{background-position:-300px 0px;width:60px;height:60px;} -.feature-highway-motorway{background-position:-300px -60px;width:60px;height:60px;} -.feature-highway-motorway-link{background-position:-300px -120px;width:60px;height:60px;} -.feature-highway-living_street{background-position:-300px -180px;width:60px;height:60px;} -.feature-highway-footway{background-position:-300px -240px;width:60px;height:60px;} -.feature-highway-cycleway{background-position:0px -300px;width:60px;height:60px;} -.feature-highway-bridleway{background-position:-60px -300px;width:60px;height:60px;} -.feature-zoo{background-position:-120px -300px;width:24px;height:24px;} -.feature-x{background-position:-144px -300px;width:24px;height:24px;} -.feature-wetland{background-position:-168px -300px;width:24px;height:24px;} -.feature-water{background-position:-192px -300px;width:24px;height:24px;} -.feature-waste-basket{background-position:-216px -300px;width:24px;height:24px;} -.feature-warehouse{background-position:-240px -300px;width:24px;height:24px;} -.feature-triangle{background-position:-264px -300px;width:24px;height:24px;} -.feature-triangle-stroked{background-position:-288px -300px;width:24px;height:24px;} -.feature-town-hall{background-position:-312px -300px;width:24px;height:24px;} -.feature-toilets{background-position:-336px -300px;width:24px;height:24px;} -.feature-theatre{background-position:-120px -324px;width:24px;height:24px;} -.feature-tennis{background-position:-144px -324px;width:24px;height:24px;} -.feature-swimming{background-position:-168px -324px;width:24px;height:24px;} -.feature-star{background-position:-192px -324px;width:24px;height:24px;} -.feature-star-stroked{background-position:-216px -324px;width:24px;height:24px;} -.feature-square{background-position:-240px -324px;width:24px;height:24px;} -.feature-square-stroked{background-position:-264px -324px;width:24px;height:24px;} -.feature-soccer{background-position:-288px -324px;width:24px;height:24px;} -.feature-slaughterhouse{background-position:-312px -324px;width:24px;height:24px;} -.feature-skiing{background-position:-336px -324px;width:24px;height:24px;} -.feature-shop{background-position:-360px 0px;width:24px;height:24px;} -.feature-school{background-position:-360px -24px;width:24px;height:24px;} -.feature-roadblock{background-position:-360px -48px;width:24px;height:24px;} -.feature-restaurant{background-position:-360px -72px;width:24px;height:24px;} -.feature-religious-muslim{background-position:-360px -96px;width:24px;height:24px;} -.feature-religious-jewish{background-position:-360px -120px;width:24px;height:24px;} -.feature-religious-christian{background-position:-360px -144px;width:24px;height:24px;} -.feature-rail{background-position:-360px -168px;width:24px;height:24px;} -.feature-rail-underground{background-position:-360px -192px;width:24px;height:24px;} -.feature-rail-above{background-position:-360px -216px;width:24px;height:24px;} -.feature-prison{background-position:-360px -240px;width:24px;height:24px;} -.feature-post{background-position:-360px -264px;width:24px;height:24px;} -.feature-police{background-position:-360px -288px;width:24px;height:24px;} -.feature-place-of-worship{background-position:-360px -312px;width:24px;height:24px;} -.feature-pitch{background-position:-360px -336px;width:24px;height:24px;} -.feature-pharmacy{background-position:0px -360px;width:24px;height:24px;} -.feature-parking{background-position:-24px -360px;width:24px;height:24px;} -.feature-parking-garage{background-position:-48px -360px;width:24px;height:24px;} -.feature-park2{background-position:-72px -360px;width:24px;height:24px;} -.feature-park{background-position:-96px -360px;width:24px;height:24px;} -.feature-oil-well{background-position:-120px -360px;width:24px;height:24px;} -.feature-museum{background-position:-144px -360px;width:24px;height:24px;} -.feature-monument{background-position:-168px -360px;width:24px;height:24px;} -.feature-minefield{background-position:-192px -360px;width:24px;height:24px;} -.feature-marker{background-position:-216px -360px;width:24px;height:24px;} -.feature-marker-stroked{background-position:-240px -360px;width:24px;height:24px;} -.feature-london-underground{background-position:-264px -360px;width:24px;height:24px;} -.feature-logging{background-position:-288px -360px;width:24px;height:24px;} -.feature-lodging{background-position:-312px -360px;width:24px;height:24px;} -.feature-library{background-position:-336px -360px;width:24px;height:24px;} -.feature-industrial{background-position:-360px -360px;width:24px;height:24px;} -.feature-hospital{background-position:-384px 0px;width:24px;height:24px;} -.feature-heliport{background-position:-384px -24px;width:24px;height:24px;} -.feature-harbor{background-position:-384px -48px;width:24px;height:24px;} -.feature-grocery{background-position:-384px -72px;width:24px;height:24px;} -.feature-golf{background-position:-384px -96px;width:24px;height:24px;} -.feature-garden{background-position:-384px -120px;width:24px;height:24px;} -.feature-fuel{background-position:-384px -144px;width:24px;height:24px;} -.feature-fire-station{background-position:-384px -168px;width:24px;height:24px;} -.feature-ferry{background-position:-384px -192px;width:24px;height:24px;} -.feature-fast-food{background-position:-384px -216px;width:24px;height:24px;} -.feature-embassy{background-position:-384px -240px;width:24px;height:24px;} -.feature-danger{background-position:-384px -264px;width:24px;height:24px;} -.feature-dam{background-position:-384px -288px;width:24px;height:24px;} -.feature-cross{background-position:-384px -312px;width:24px;height:24px;} -.feature-cricket{background-position:-384px -336px;width:24px;height:24px;} -.feature-commercial{background-position:-384px -360px;width:24px;height:24px;} -.feature-college{background-position:0px -384px;width:24px;height:24px;} -.feature-circle{background-position:-24px -384px;width:24px;height:24px;} -.feature-circle-stroked{background-position:-48px -384px;width:24px;height:24px;} -.feature-cinema{background-position:-72px -384px;width:24px;height:24px;} -.feature-cemetery{background-position:-96px -384px;width:24px;height:24px;} -.feature-campsite{background-position:-120px -384px;width:24px;height:24px;} -.feature-cafe{background-position:-144px -384px;width:24px;height:24px;} -.feature-bus{background-position:-168px -384px;width:24px;height:24px;} -.feature-bicycle{background-position:-192px -384px;width:24px;height:24px;} -.feature-beer{background-position:-216px -384px;width:24px;height:24px;} -.feature-basketball{background-position:-240px -384px;width:24px;height:24px;} -.feature-baseball{background-position:-264px -384px;width:24px;height:24px;} -.feature-bar{background-position:-288px -384px;width:24px;height:24px;} -.feature-bank{background-position:-312px -384px;width:24px;height:24px;} -.feature-art-gallery{background-position:-336px -384px;width:24px;height:24px;} -.feature-america-football{background-position:-360px -384px;width:24px;height:24px;} -.feature-alcohol-shop{background-position:-384px -384px;width:24px;height:24px;} -.feature-airport{background-position:-408px 0px;width:24px;height:24px;} -.feature-airfield{background-position:-408px -24px;width:24px;height:24px;} -.feature-zoo-18{background-position:-408px -48px;width:18px;height:18px;} -.feature-x-18{background-position:-408px -66px;width:18px;height:18px;} -.feature-wetland-18{background-position:-408px -84px;width:18px;height:18px;} -.feature-water-18{background-position:-408px -102px;width:18px;height:18px;} -.feature-waste-basket-18{background-position:-408px -120px;width:18px;height:18px;} -.feature-warehouse-18{background-position:-408px -138px;width:18px;height:18px;} -.feature-triangle-stroked-18{background-position:-408px -156px;width:18px;height:18px;} -.feature-triangle-18{background-position:-408px -174px;width:18px;height:18px;} -.feature-town-hall-18{background-position:-408px -192px;width:18px;height:18px;} -.feature-toilets-18{background-position:-408px -210px;width:18px;height:18px;} -.feature-theatre-18{background-position:-408px -228px;width:18px;height:18px;} -.feature-tennis-18{background-position:-408px -246px;width:18px;height:18px;} -.feature-swimming-18{background-position:-408px -264px;width:18px;height:18px;} -.feature-star-stroked-18{background-position:-408px -282px;width:18px;height:18px;} -.feature-star-18{background-position:-408px -300px;width:18px;height:18px;} -.feature-square-stroked-18{background-position:-408px -318px;width:18px;height:18px;} -.feature-square-18{background-position:-408px -336px;width:18px;height:18px;} -.feature-soccer-18{background-position:-408px -354px;width:18px;height:18px;} -.feature-slaughterhouse-18{background-position:-408px -372px;width:18px;height:18px;} -.feature-skiing-18{background-position:-408px -390px;width:18px;height:18px;} -.feature-shop-18{background-position:0px -408px;width:18px;height:18px;} -.feature-school-18{background-position:-18px -408px;width:18px;height:18px;} -.feature-roadblock-18{background-position:-36px -408px;width:18px;height:18px;} -.feature-restaurant-18{background-position:-54px -408px;width:18px;height:18px;} -.feature-religious-muslim-18{background-position:-72px -408px;width:18px;height:18px;} -.feature-religious-jewish-18{background-position:-90px -408px;width:18px;height:18px;} -.feature-religious-christian-18{background-position:-108px -408px;width:18px;height:18px;} -.feature-rail-underground-18{background-position:-126px -408px;width:18px;height:18px;} -.feature-rail-above-18{background-position:-144px -408px;width:18px;height:18px;} -.feature-rail-18{background-position:-162px -408px;width:18px;height:18px;} -.feature-prison-18{background-position:-180px -408px;width:18px;height:18px;} -.feature-post-18{background-position:-198px -408px;width:18px;height:18px;} -.feature-police-18{background-position:-216px -408px;width:18px;height:18px;} -.feature-place-of-worship-18{background-position:-234px -408px;width:18px;height:18px;} -.feature-pitch-18{background-position:-252px -408px;width:18px;height:18px;} -.feature-pharmacy-18{background-position:-270px -408px;width:18px;height:18px;} -.feature-parking-garage-18{background-position:-288px -408px;width:18px;height:18px;} -.feature-parking-18{background-position:-306px -408px;width:18px;height:18px;} -.feature-park2-18{background-position:-324px -408px;width:18px;height:18px;} -.feature-park-18{background-position:-342px -408px;width:18px;height:18px;} -.feature-oil-well-18{background-position:-360px -408px;width:18px;height:18px;} -.feature-museum-18{background-position:-378px -408px;width:18px;height:18px;} -.feature-monument-18{background-position:-396px -408px;width:18px;height:18px;} -.feature-minefield-18{background-position:-414px -408px;width:18px;height:18px;} -.feature-marker-stroked-18{background-position:-432px 0px;width:18px;height:18px;} -.feature-marker-18{background-position:-432px -18px;width:18px;height:18px;} -.feature-london-underground-18{background-position:-432px -36px;width:18px;height:18px;} -.feature-logging-18{background-position:-432px -54px;width:18px;height:18px;} -.feature-lodging-18{background-position:-432px -72px;width:18px;height:18px;} -.feature-library-18{background-position:-432px -90px;width:18px;height:18px;} -.feature-industrial-18{background-position:-432px -108px;width:18px;height:18px;} -.feature-hospital-18{background-position:-432px -126px;width:18px;height:18px;} -.feature-heliport-18{background-position:-432px -144px;width:18px;height:18px;} -.feature-harbor-18{background-position:-432px -162px;width:18px;height:18px;} -.feature-grocery-18{background-position:-432px -180px;width:18px;height:18px;} -.feature-golf-18{background-position:-432px -198px;width:18px;height:18px;} -.feature-garden-18{background-position:-432px -216px;width:18px;height:18px;} -.feature-fuel-18{background-position:-432px -234px;width:18px;height:18px;} -.feature-fire-station-18{background-position:-432px -252px;width:18px;height:18px;} -.feature-ferry-18{background-position:-432px -270px;width:18px;height:18px;} -.feature-fast-food-18{background-position:-432px -288px;width:18px;height:18px;} -.feature-embassy-18{background-position:-432px -306px;width:18px;height:18px;} -.feature-danger-18{background-position:-432px -324px;width:18px;height:18px;} -.feature-dam-18{background-position:-432px -342px;width:18px;height:18px;} -.feature-cross-18{background-position:-432px -360px;width:18px;height:18px;} -.feature-cricket-18{background-position:-432px -378px;width:18px;height:18px;} -.feature-commercial-18{background-position:-432px -396px;width:18px;height:18px;} -.feature-college-18{background-position:0px -426px;width:18px;height:18px;} -.feature-circle-stroked-18{background-position:-18px -426px;width:18px;height:18px;} -.feature-circle-18{background-position:-36px -426px;width:18px;height:18px;} -.feature-cinema-18{background-position:-54px -426px;width:18px;height:18px;} -.feature-cemetery-18{background-position:-72px -426px;width:18px;height:18px;} -.feature-campsite-18{background-position:-90px -426px;width:18px;height:18px;} -.feature-cafe-18{background-position:-108px -426px;width:18px;height:18px;} -.feature-bus-18{background-position:-126px -426px;width:18px;height:18px;} -.feature-bicycle-18{background-position:-144px -426px;width:18px;height:18px;} -.feature-beer-18{background-position:-162px -426px;width:18px;height:18px;} -.feature-basketball-18{background-position:-180px -426px;width:18px;height:18px;} -.feature-baseball-18{background-position:-198px -426px;width:18px;height:18px;} -.feature-bar-18{background-position:-216px -426px;width:18px;height:18px;} -.feature-bank-18{background-position:-234px -426px;width:18px;height:18px;} -.feature-art-gallery-18{background-position:-252px -426px;width:18px;height:18px;} -.feature-america-football-18{background-position:-270px -426px;width:18px;height:18px;} -.feature-alcohol-shop-18{background-position:-288px -426px;width:18px;height:18px;} -.feature-airport-18{background-position:-306px -426px;width:18px;height:18px;} -.feature-airfield-18{background-position:-324px -426px;width:18px;height:18px;} -.feature-zoo-12{background-position:-432px -414px;width:12px;height:12px;} -.feature-x-12{background-position:-120px -348px;width:12px;height:12px;} -.feature-wetland-12{background-position:-132px -348px;width:12px;height:12px;} -.feature-water-12{background-position:-144px -348px;width:12px;height:12px;} -.feature-waste-basket-12{background-position:-156px -348px;width:12px;height:12px;} -.feature-warehouse-12{background-position:-168px -348px;width:12px;height:12px;} -.feature-triangle-stroked-12{background-position:-180px -348px;width:12px;height:12px;} -.feature-triangle-12{background-position:-192px -348px;width:12px;height:12px;} -.feature-town-hall-12{background-position:-204px -348px;width:12px;height:12px;} -.feature-toilets-12{background-position:-216px -348px;width:12px;height:12px;} -.feature-theatre-12{background-position:-228px -348px;width:12px;height:12px;} -.feature-tennis-12{background-position:-240px -348px;width:12px;height:12px;} -.feature-swimming-12{background-position:-252px -348px;width:12px;height:12px;} -.feature-star-stroked-12{background-position:-264px -348px;width:12px;height:12px;} -.feature-star-12{background-position:-276px -348px;width:12px;height:12px;} -.feature-square-stroked-12{background-position:-288px -348px;width:12px;height:12px;} -.feature-square-12{background-position:-300px -348px;width:12px;height:12px;} -.feature-soccer-12{background-position:-312px -348px;width:12px;height:12px;} -.feature-slaughterhouse-12{background-position:-324px -348px;width:12px;height:12px;} -.feature-skiing-12{background-position:-336px -348px;width:12px;height:12px;} -.feature-shop-12{background-position:-348px -348px;width:12px;height:12px;} -.feature-school-12{background-position:-342px -426px;width:12px;height:12px;} -.feature-roadblock-12{background-position:-354px -426px;width:12px;height:12px;} -.feature-restaurant-12{background-position:-366px -426px;width:12px;height:12px;} -.feature-religious-muslim-12{background-position:-378px -426px;width:12px;height:12px;} -.feature-religious-jewish-12{background-position:-390px -426px;width:12px;height:12px;} -.feature-religious-christian-12{background-position:-402px -426px;width:12px;height:12px;} -.feature-rail-underground-12{background-position:-414px -426px;width:12px;height:12px;} -.feature-rail-above-12{background-position:-426px -426px;width:12px;height:12px;} -.feature-rail-12{background-position:-438px -426px;width:12px;height:12px;} -.feature-prison-12{background-position:-450px 0px;width:12px;height:12px;} -.feature-post-12{background-position:-450px -12px;width:12px;height:12px;} -.feature-police-12{background-position:-450px -24px;width:12px;height:12px;} -.feature-place-of-worship-12{background-position:-450px -36px;width:12px;height:12px;} -.feature-pitch-12{background-position:-450px -48px;width:12px;height:12px;} -.feature-pharmacy-12{background-position:-450px -60px;width:12px;height:12px;} -.feature-parking-garage-12{background-position:-450px -72px;width:12px;height:12px;} -.feature-parking-12{background-position:-450px -84px;width:12px;height:12px;} -.feature-park2-12{background-position:-450px -96px;width:12px;height:12px;} -.feature-park-12{background-position:-450px -108px;width:12px;height:12px;} -.feature-oil-well-12{background-position:-450px -120px;width:12px;height:12px;} -.feature-museum-12{background-position:-450px -132px;width:12px;height:12px;} -.feature-monument-12{background-position:-450px -144px;width:12px;height:12px;} -.feature-minefield-12{background-position:-450px -156px;width:12px;height:12px;} -.feature-marker-stroked-12{background-position:-450px -168px;width:12px;height:12px;} -.feature-marker-12{background-position:-450px -180px;width:12px;height:12px;} -.feature-london-underground-12{background-position:-450px -192px;width:12px;height:12px;} -.feature-logging-12{background-position:-450px -204px;width:12px;height:12px;} -.feature-lodging-12{background-position:-450px -216px;width:12px;height:12px;} -.feature-library-12{background-position:-450px -228px;width:12px;height:12px;} -.feature-industrial-12{background-position:-450px -240px;width:12px;height:12px;} -.feature-hospital-12{background-position:-450px -252px;width:12px;height:12px;} -.feature-heliport-12{background-position:-450px -264px;width:12px;height:12px;} -.feature-harbor-12{background-position:-450px -276px;width:12px;height:12px;} -.feature-grocery-12{background-position:-450px -288px;width:12px;height:12px;} -.feature-golf-12{background-position:-450px -300px;width:12px;height:12px;} -.feature-garden-12{background-position:-450px -312px;width:12px;height:12px;} -.feature-fuel-12{background-position:-450px -324px;width:12px;height:12px;} -.feature-fire-station-12{background-position:-450px -336px;width:12px;height:12px;} -.feature-ferry-12{background-position:-450px -348px;width:12px;height:12px;} -.feature-fast-food-12{background-position:-450px -360px;width:12px;height:12px;} -.feature-embassy-12{background-position:-450px -372px;width:12px;height:12px;} -.feature-danger-12{background-position:-450px -384px;width:12px;height:12px;} -.feature-dam-12{background-position:-450px -396px;width:12px;height:12px;} -.feature-cross-12{background-position:-450px -408px;width:12px;height:12px;} -.feature-cricket-12{background-position:-450px -420px;width:12px;height:12px;} -.feature-commercial-12{background-position:-450px -432px;width:12px;height:12px;} -.feature-college-12{background-position:0px -444px;width:12px;height:12px;} -.feature-circle-stroked-12{background-position:-12px -444px;width:12px;height:12px;} -.feature-circle-12{background-position:-24px -444px;width:12px;height:12px;} -.feature-cinema-12{background-position:-36px -444px;width:12px;height:12px;} -.feature-cemetery-12{background-position:-48px -444px;width:12px;height:12px;} -.feature-campsite-12{background-position:-60px -444px;width:12px;height:12px;} -.feature-cafe-12{background-position:-72px -444px;width:12px;height:12px;} -.feature-bus-12{background-position:-84px -444px;width:12px;height:12px;} -.feature-bicycle-12{background-position:-96px -444px;width:12px;height:12px;} -.feature-beer-12{background-position:-108px -444px;width:12px;height:12px;} -.feature-basketball-12{background-position:-120px -444px;width:12px;height:12px;} -.feature-baseball-12{background-position:-132px -444px;width:12px;height:12px;} -.feature-bar-12{background-position:-144px -444px;width:12px;height:12px;} -.feature-bank-12{background-position:-156px -444px;width:12px;height:12px;} -.feature-art-gallery-12{background-position:-168px -444px;width:12px;height:12px;} -.feature-america-football-12{background-position:-180px -444px;width:12px;height:12px;} -.feature-alcohol-shop-12{background-position:-192px -444px;width:12px;height:12px;} -.feature-airport-12{background-position:-204px -444px;width:12px;height:12px;} -.feature-airfield-12{background-position:-216px -444px;width:12px;height:12px;} +.feature-other-line{background-position:-180px -120px;width:60px;height:60px;} +.feature-highway-unclassified{background-position:0px -180px;width:60px;height:60px;} +.feature-highway-trunk{background-position:-60px -180px;width:60px;height:60px;} +.feature-highway-trunk-link{background-position:-120px -180px;width:60px;height:60px;} +.feature-highway-track{background-position:-180px -180px;width:60px;height:60px;} +.feature-highway-tertiary:link{background-position:-240px 0px;width:60px;height:60px;} +.feature-highway-tertiary{background-position:-240px -60px;width:60px;height:60px;} +.feature-highway-steps{background-position:-240px -120px;width:60px;height:60px;} +.feature-highway-service{background-position:-240px -180px;width:60px;height:60px;} +.feature-highway-secondary{background-position:0px -240px;width:60px;height:60px;} +.feature-highway-secondary-link{background-position:-60px -240px;width:60px;height:60px;} +.feature-highway-road{background-position:-120px -240px;width:60px;height:60px;} +.feature-highway-residential{background-position:-180px -240px;width:60px;height:60px;} +.feature-highway-primary{background-position:-240px -240px;width:60px;height:60px;} +.feature-highway-primary-link{background-position:-300px 0px;width:60px;height:60px;} +.feature-highway-path{background-position:-300px -60px;width:60px;height:60px;} +.feature-highway-motorway{background-position:-300px -120px;width:60px;height:60px;} +.feature-highway-motorway-link{background-position:-300px -180px;width:60px;height:60px;} +.feature-highway-living_street{background-position:-300px -240px;width:60px;height:60px;} +.feature-highway-footway{background-position:0px -300px;width:60px;height:60px;} +.feature-highway-cycleway{background-position:-60px -300px;width:60px;height:60px;} +.feature-highway-bridleway{background-position:-120px -300px;width:60px;height:60px;} +.feature-category-roads{background-position:-180px -300px;width:60px;height:60px;} +.feature-zoo{background-position:-240px -300px;width:24px;height:24px;} +.feature-x{background-position:-264px -300px;width:24px;height:24px;} +.feature-wetland{background-position:-288px -300px;width:24px;height:24px;} +.feature-water{background-position:-312px -300px;width:24px;height:24px;} +.feature-waste-basket{background-position:-336px -300px;width:24px;height:24px;} +.feature-warehouse{background-position:-240px -324px;width:24px;height:24px;} +.feature-triangle{background-position:-264px -324px;width:24px;height:24px;} +.feature-triangle-stroked{background-position:-288px -324px;width:24px;height:24px;} +.feature-town-hall{background-position:-312px -324px;width:24px;height:24px;} +.feature-toilets{background-position:-336px -324px;width:24px;height:24px;} +.feature-theatre{background-position:-360px 0px;width:24px;height:24px;} +.feature-tennis{background-position:-360px -24px;width:24px;height:24px;} +.feature-swimming{background-position:-360px -48px;width:24px;height:24px;} +.feature-star{background-position:-360px -72px;width:24px;height:24px;} +.feature-star-stroked{background-position:-360px -96px;width:24px;height:24px;} +.feature-square{background-position:-360px -120px;width:24px;height:24px;} +.feature-square-stroked{background-position:-360px -144px;width:24px;height:24px;} +.feature-soccer{background-position:-360px -168px;width:24px;height:24px;} +.feature-slaughterhouse{background-position:-360px -192px;width:24px;height:24px;} +.feature-skiing{background-position:-360px -216px;width:24px;height:24px;} +.feature-shop{background-position:-360px -240px;width:24px;height:24px;} +.feature-school{background-position:-360px -264px;width:24px;height:24px;} +.feature-roadblock{background-position:-360px -288px;width:24px;height:24px;} +.feature-restaurant{background-position:-360px -312px;width:24px;height:24px;} +.feature-religious-muslim{background-position:-360px -336px;width:24px;height:24px;} +.feature-religious-jewish{background-position:0px -360px;width:24px;height:24px;} +.feature-religious-christian{background-position:-24px -360px;width:24px;height:24px;} +.feature-rail{background-position:-48px -360px;width:24px;height:24px;} +.feature-rail-underground{background-position:-72px -360px;width:24px;height:24px;} +.feature-rail-above{background-position:-96px -360px;width:24px;height:24px;} +.feature-prison{background-position:-120px -360px;width:24px;height:24px;} +.feature-post{background-position:-144px -360px;width:24px;height:24px;} +.feature-police{background-position:-168px -360px;width:24px;height:24px;} +.feature-place-of-worship{background-position:-192px -360px;width:24px;height:24px;} +.feature-pitch{background-position:-216px -360px;width:24px;height:24px;} +.feature-pharmacy{background-position:-240px -360px;width:24px;height:24px;} +.feature-parking{background-position:-264px -360px;width:24px;height:24px;} +.feature-parking-garage{background-position:-288px -360px;width:24px;height:24px;} +.feature-park2{background-position:-312px -360px;width:24px;height:24px;} +.feature-park{background-position:-336px -360px;width:24px;height:24px;} +.feature-oil-well{background-position:-360px -360px;width:24px;height:24px;} +.feature-museum{background-position:-384px 0px;width:24px;height:24px;} +.feature-monument{background-position:-384px -24px;width:24px;height:24px;} +.feature-minefield{background-position:-384px -48px;width:24px;height:24px;} +.feature-marker{background-position:-384px -72px;width:24px;height:24px;} +.feature-marker-stroked{background-position:-384px -96px;width:24px;height:24px;} +.feature-london-underground{background-position:-384px -120px;width:24px;height:24px;} +.feature-logging{background-position:-384px -144px;width:24px;height:24px;} +.feature-lodging{background-position:-384px -168px;width:24px;height:24px;} +.feature-library{background-position:-384px -192px;width:24px;height:24px;} +.feature-industrial{background-position:-384px -216px;width:24px;height:24px;} +.feature-hospital{background-position:-384px -240px;width:24px;height:24px;} +.feature-heliport{background-position:-384px -264px;width:24px;height:24px;} +.feature-harbor{background-position:-384px -288px;width:24px;height:24px;} +.feature-grocery{background-position:-384px -312px;width:24px;height:24px;} +.feature-golf{background-position:-384px -336px;width:24px;height:24px;} +.feature-garden{background-position:-384px -360px;width:24px;height:24px;} +.feature-fuel{background-position:0px -384px;width:24px;height:24px;} +.feature-fire-station{background-position:-24px -384px;width:24px;height:24px;} +.feature-ferry{background-position:-48px -384px;width:24px;height:24px;} +.feature-fast-food{background-position:-72px -384px;width:24px;height:24px;} +.feature-embassy{background-position:-96px -384px;width:24px;height:24px;} +.feature-danger{background-position:-120px -384px;width:24px;height:24px;} +.feature-dam{background-position:-144px -384px;width:24px;height:24px;} +.feature-cross{background-position:-168px -384px;width:24px;height:24px;} +.feature-cricket{background-position:-192px -384px;width:24px;height:24px;} +.feature-commercial{background-position:-216px -384px;width:24px;height:24px;} +.feature-college{background-position:-240px -384px;width:24px;height:24px;} +.feature-circle{background-position:-264px -384px;width:24px;height:24px;} +.feature-circle-stroked{background-position:-288px -384px;width:24px;height:24px;} +.feature-cinema{background-position:-312px -384px;width:24px;height:24px;} +.feature-cemetery{background-position:-336px -384px;width:24px;height:24px;} +.feature-campsite{background-position:-360px -384px;width:24px;height:24px;} +.feature-cafe{background-position:-384px -384px;width:24px;height:24px;} +.feature-bus{background-position:-408px 0px;width:24px;height:24px;} +.feature-bicycle{background-position:-408px -24px;width:24px;height:24px;} +.feature-beer{background-position:-408px -48px;width:24px;height:24px;} +.feature-basketball{background-position:-408px -72px;width:24px;height:24px;} +.feature-baseball{background-position:-408px -96px;width:24px;height:24px;} +.feature-bar{background-position:-408px -120px;width:24px;height:24px;} +.feature-bank{background-position:-408px -144px;width:24px;height:24px;} +.feature-art-gallery{background-position:-408px -168px;width:24px;height:24px;} +.feature-america-football{background-position:-408px -192px;width:24px;height:24px;} +.feature-alcohol-shop{background-position:-408px -216px;width:24px;height:24px;} +.feature-airport{background-position:-408px -240px;width:24px;height:24px;} +.feature-airfield{background-position:-408px -264px;width:24px;height:24px;} +.feature-zoo-18{background-position:-408px -288px;width:18px;height:18px;} +.feature-x-18{background-position:-408px -306px;width:18px;height:18px;} +.feature-wetland-18{background-position:-408px -324px;width:18px;height:18px;} +.feature-water-18{background-position:-408px -342px;width:18px;height:18px;} +.feature-waste-basket-18{background-position:-408px -360px;width:18px;height:18px;} +.feature-warehouse-18{background-position:-408px -378px;width:18px;height:18px;} +.feature-triangle-stroked-18{background-position:0px -408px;width:18px;height:18px;} +.feature-triangle-18{background-position:-18px -408px;width:18px;height:18px;} +.feature-town-hall-18{background-position:-36px -408px;width:18px;height:18px;} +.feature-toilets-18{background-position:-54px -408px;width:18px;height:18px;} +.feature-theatre-18{background-position:-72px -408px;width:18px;height:18px;} +.feature-tennis-18{background-position:-90px -408px;width:18px;height:18px;} +.feature-swimming-18{background-position:-108px -408px;width:18px;height:18px;} +.feature-star-stroked-18{background-position:-126px -408px;width:18px;height:18px;} +.feature-star-18{background-position:-144px -408px;width:18px;height:18px;} +.feature-square-stroked-18{background-position:-162px -408px;width:18px;height:18px;} +.feature-square-18{background-position:-180px -408px;width:18px;height:18px;} +.feature-soccer-18{background-position:-198px -408px;width:18px;height:18px;} +.feature-slaughterhouse-18{background-position:-216px -408px;width:18px;height:18px;} +.feature-skiing-18{background-position:-234px -408px;width:18px;height:18px;} +.feature-shop-18{background-position:-252px -408px;width:18px;height:18px;} +.feature-school-18{background-position:-270px -408px;width:18px;height:18px;} +.feature-roadblock-18{background-position:-288px -408px;width:18px;height:18px;} +.feature-restaurant-18{background-position:-306px -408px;width:18px;height:18px;} +.feature-religious-muslim-18{background-position:-324px -408px;width:18px;height:18px;} +.feature-religious-jewish-18{background-position:-342px -408px;width:18px;height:18px;} +.feature-religious-christian-18{background-position:-360px -408px;width:18px;height:18px;} +.feature-rail-underground-18{background-position:-378px -408px;width:18px;height:18px;} +.feature-rail-above-18{background-position:-396px -408px;width:18px;height:18px;} +.feature-rail-18{background-position:-414px -408px;width:18px;height:18px;} +.feature-prison-18{background-position:-432px 0px;width:18px;height:18px;} +.feature-post-18{background-position:-432px -18px;width:18px;height:18px;} +.feature-police-18{background-position:-432px -36px;width:18px;height:18px;} +.feature-place-of-worship-18{background-position:-432px -54px;width:18px;height:18px;} +.feature-pitch-18{background-position:-432px -72px;width:18px;height:18px;} +.feature-pharmacy-18{background-position:-432px -90px;width:18px;height:18px;} +.feature-parking-garage-18{background-position:-432px -108px;width:18px;height:18px;} +.feature-parking-18{background-position:-432px -126px;width:18px;height:18px;} +.feature-park2-18{background-position:-432px -144px;width:18px;height:18px;} +.feature-park-18{background-position:-432px -162px;width:18px;height:18px;} +.feature-oil-well-18{background-position:-432px -180px;width:18px;height:18px;} +.feature-museum-18{background-position:-432px -198px;width:18px;height:18px;} +.feature-monument-18{background-position:-432px -216px;width:18px;height:18px;} +.feature-minefield-18{background-position:-432px -234px;width:18px;height:18px;} +.feature-marker-stroked-18{background-position:-432px -252px;width:18px;height:18px;} +.feature-marker-18{background-position:-432px -270px;width:18px;height:18px;} +.feature-london-underground-18{background-position:-432px -288px;width:18px;height:18px;} +.feature-logging-18{background-position:-432px -306px;width:18px;height:18px;} +.feature-lodging-18{background-position:-432px -324px;width:18px;height:18px;} +.feature-library-18{background-position:-432px -342px;width:18px;height:18px;} +.feature-industrial-18{background-position:-432px -360px;width:18px;height:18px;} +.feature-hospital-18{background-position:-432px -378px;width:18px;height:18px;} +.feature-heliport-18{background-position:-432px -396px;width:18px;height:18px;} +.feature-harbor-18{background-position:0px -426px;width:18px;height:18px;} +.feature-grocery-18{background-position:-18px -426px;width:18px;height:18px;} +.feature-golf-18{background-position:-36px -426px;width:18px;height:18px;} +.feature-garden-18{background-position:-54px -426px;width:18px;height:18px;} +.feature-fuel-18{background-position:-72px -426px;width:18px;height:18px;} +.feature-fire-station-18{background-position:-90px -426px;width:18px;height:18px;} +.feature-ferry-18{background-position:-108px -426px;width:18px;height:18px;} +.feature-fast-food-18{background-position:-126px -426px;width:18px;height:18px;} +.feature-embassy-18{background-position:-144px -426px;width:18px;height:18px;} +.feature-danger-18{background-position:-162px -426px;width:18px;height:18px;} +.feature-dam-18{background-position:-180px -426px;width:18px;height:18px;} +.feature-cross-18{background-position:-198px -426px;width:18px;height:18px;} +.feature-cricket-18{background-position:-216px -426px;width:18px;height:18px;} +.feature-commercial-18{background-position:-234px -426px;width:18px;height:18px;} +.feature-college-18{background-position:-252px -426px;width:18px;height:18px;} +.feature-circle-stroked-18{background-position:-270px -426px;width:18px;height:18px;} +.feature-circle-18{background-position:-288px -426px;width:18px;height:18px;} +.feature-cinema-18{background-position:-306px -426px;width:18px;height:18px;} +.feature-cemetery-18{background-position:-324px -426px;width:18px;height:18px;} +.feature-campsite-18{background-position:-342px -426px;width:18px;height:18px;} +.feature-cafe-18{background-position:-360px -426px;width:18px;height:18px;} +.feature-bus-18{background-position:-378px -426px;width:18px;height:18px;} +.feature-bicycle-18{background-position:-396px -426px;width:18px;height:18px;} +.feature-beer-18{background-position:-414px -426px;width:18px;height:18px;} +.feature-basketball-18{background-position:-432px -426px;width:18px;height:18px;} +.feature-baseball-18{background-position:-450px 0px;width:18px;height:18px;} +.feature-bar-18{background-position:-450px -18px;width:18px;height:18px;} +.feature-bank-18{background-position:-450px -36px;width:18px;height:18px;} +.feature-art-gallery-18{background-position:-450px -54px;width:18px;height:18px;} +.feature-america-football-18{background-position:-450px -72px;width:18px;height:18px;} +.feature-alcohol-shop-18{background-position:-450px -90px;width:18px;height:18px;} +.feature-airport-18{background-position:-450px -108px;width:18px;height:18px;} +.feature-airfield-18{background-position:-450px -126px;width:18px;height:18px;} +.feature-zoo-12{background-position:-450px -144px;width:12px;height:12px;} +.feature-x-12{background-position:-450px -156px;width:12px;height:12px;} +.feature-wetland-12{background-position:-450px -168px;width:12px;height:12px;} +.feature-water-12{background-position:-450px -180px;width:12px;height:12px;} +.feature-waste-basket-12{background-position:-450px -192px;width:12px;height:12px;} +.feature-warehouse-12{background-position:-450px -204px;width:12px;height:12px;} +.feature-triangle-stroked-12{background-position:-450px -216px;width:12px;height:12px;} +.feature-triangle-12{background-position:-450px -228px;width:12px;height:12px;} +.feature-town-hall-12{background-position:-450px -240px;width:12px;height:12px;} +.feature-toilets-12{background-position:-450px -252px;width:12px;height:12px;} +.feature-theatre-12{background-position:-450px -264px;width:12px;height:12px;} +.feature-tennis-12{background-position:-450px -276px;width:12px;height:12px;} +.feature-swimming-12{background-position:-450px -288px;width:12px;height:12px;} +.feature-star-stroked-12{background-position:-450px -300px;width:12px;height:12px;} +.feature-star-12{background-position:-450px -312px;width:12px;height:12px;} +.feature-square-stroked-12{background-position:-450px -324px;width:12px;height:12px;} +.feature-square-12{background-position:-450px -336px;width:12px;height:12px;} +.feature-soccer-12{background-position:-450px -348px;width:12px;height:12px;} +.feature-slaughterhouse-12{background-position:-450px -360px;width:12px;height:12px;} +.feature-skiing-12{background-position:-450px -372px;width:12px;height:12px;} +.feature-shop-12{background-position:-450px -384px;width:12px;height:12px;} +.feature-school-12{background-position:-450px -396px;width:12px;height:12px;} +.feature-roadblock-12{background-position:-450px -408px;width:12px;height:12px;} +.feature-restaurant-12{background-position:-450px -420px;width:12px;height:12px;} +.feature-religious-muslim-12{background-position:-450px -432px;width:12px;height:12px;} +.feature-religious-jewish-12{background-position:-432px -414px;width:12px;height:12px;} +.feature-religious-christian-12{background-position:-408px -396px;width:12px;height:12px;} +.feature-rail-underground-12{background-position:-420px -396px;width:12px;height:12px;} +.feature-rail-above-12{background-position:-240px -348px;width:12px;height:12px;} +.feature-rail-12{background-position:-252px -348px;width:12px;height:12px;} +.feature-prison-12{background-position:-264px -348px;width:12px;height:12px;} +.feature-post-12{background-position:-276px -348px;width:12px;height:12px;} +.feature-police-12{background-position:-288px -348px;width:12px;height:12px;} +.feature-place-of-worship-12{background-position:-300px -348px;width:12px;height:12px;} +.feature-pitch-12{background-position:-312px -348px;width:12px;height:12px;} +.feature-pharmacy-12{background-position:-324px -348px;width:12px;height:12px;} +.feature-parking-garage-12{background-position:-336px -348px;width:12px;height:12px;} +.feature-parking-12{background-position:-348px -348px;width:12px;height:12px;} +.feature-park2-12{background-position:0px -444px;width:12px;height:12px;} +.feature-park-12{background-position:-12px -444px;width:12px;height:12px;} +.feature-oil-well-12{background-position:-24px -444px;width:12px;height:12px;} +.feature-museum-12{background-position:-36px -444px;width:12px;height:12px;} +.feature-monument-12{background-position:-48px -444px;width:12px;height:12px;} +.feature-minefield-12{background-position:-60px -444px;width:12px;height:12px;} +.feature-marker-stroked-12{background-position:-72px -444px;width:12px;height:12px;} +.feature-marker-12{background-position:-84px -444px;width:12px;height:12px;} +.feature-london-underground-12{background-position:-96px -444px;width:12px;height:12px;} +.feature-logging-12{background-position:-108px -444px;width:12px;height:12px;} +.feature-lodging-12{background-position:-120px -444px;width:12px;height:12px;} +.feature-library-12{background-position:-132px -444px;width:12px;height:12px;} +.feature-industrial-12{background-position:-144px -444px;width:12px;height:12px;} +.feature-hospital-12{background-position:-156px -444px;width:12px;height:12px;} +.feature-heliport-12{background-position:-168px -444px;width:12px;height:12px;} +.feature-harbor-12{background-position:-180px -444px;width:12px;height:12px;} +.feature-grocery-12{background-position:-192px -444px;width:12px;height:12px;} +.feature-golf-12{background-position:-204px -444px;width:12px;height:12px;} +.feature-garden-12{background-position:-216px -444px;width:12px;height:12px;} +.feature-fuel-12{background-position:-228px -444px;width:12px;height:12px;} +.feature-fire-station-12{background-position:-240px -444px;width:12px;height:12px;} +.feature-ferry-12{background-position:-252px -444px;width:12px;height:12px;} +.feature-fast-food-12{background-position:-264px -444px;width:12px;height:12px;} +.feature-embassy-12{background-position:-276px -444px;width:12px;height:12px;} +.feature-danger-12{background-position:-288px -444px;width:12px;height:12px;} +.feature-dam-12{background-position:-300px -444px;width:12px;height:12px;} +.feature-cross-12{background-position:-312px -444px;width:12px;height:12px;} +.feature-cricket-12{background-position:-324px -444px;width:12px;height:12px;} +.feature-commercial-12{background-position:-336px -444px;width:12px;height:12px;} +.feature-college-12{background-position:-348px -444px;width:12px;height:12px;} +.feature-circle-stroked-12{background-position:-360px -444px;width:12px;height:12px;} +.feature-circle-12{background-position:-372px -444px;width:12px;height:12px;} +.feature-cinema-12{background-position:-384px -444px;width:12px;height:12px;} +.feature-cemetery-12{background-position:-396px -444px;width:12px;height:12px;} +.feature-campsite-12{background-position:-408px -444px;width:12px;height:12px;} +.feature-cafe-12{background-position:-420px -444px;width:12px;height:12px;} +.feature-bus-12{background-position:-432px -444px;width:12px;height:12px;} +.feature-bicycle-12{background-position:-444px -444px;width:12px;height:12px;} +.feature-beer-12{background-position:-456px -444px;width:12px;height:12px;} +.feature-basketball-12{background-position:0px -456px;width:12px;height:12px;} +.feature-baseball-12{background-position:-12px -456px;width:12px;height:12px;} +.feature-bar-12{background-position:-24px -456px;width:12px;height:12px;} +.feature-bank-12{background-position:-36px -456px;width:12px;height:12px;} +.feature-art-gallery-12{background-position:-48px -456px;width:12px;height:12px;} +.feature-america-football-12{background-position:-60px -456px;width:12px;height:12px;} +.feature-alcohol-shop-12{background-position:-72px -456px;width:12px;height:12px;} +.feature-airport-12{background-position:-84px -456px;width:12px;height:12px;} +.feature-airfield-12{background-position:-96px -456px;width:12px;height:12px;} diff --git a/data/presets/presets/railway/subway.json b/data/presets/presets/railway/subway.json index a098786e9..67dffda28 100644 --- a/data/presets/presets/railway/subway.json +++ b/data/presets/presets/railway/subway.json @@ -1,5 +1,5 @@ { - "icon": "railway-rail", + "icon": "railway-subway", "fields": [ "structure" ], @@ -11,4 +11,4 @@ }, "terms": [], "name": "Subway" -} \ No newline at end of file +} diff --git a/img/feature-icons.png b/img/feature-icons.png index bb9943008..d85f78ec6 100644 Binary files a/img/feature-icons.png and b/img/feature-icons.png differ diff --git a/img/source/makesprite b/img/source/makesprite index 6d4f092db..79a42f78b 100755 --- a/img/source/makesprite +++ b/img/source/makesprite @@ -28,7 +28,7 @@ done cp $MAKIPATH/renders/*-{12,18}.png feature-icons ## Export pngs from line-preset svg -grep --only-matching "id=\"\(highway\|waterway\|railway\|power\)[^\"]*" line-presets.svg | while read line; do +grep --only-matching "id=\"\(highway\|waterway\|railway\|power\|other\|category\)[^\"]*" line-presets.svg | while read line; do id=`echo $line | sed 's/id="//'` inkscape --export-id=$id --export-png=feature-icons/$id.png line-presets.svg done diff --git a/js/id/ui/preset_grid.js b/js/id/ui/preset_grid.js index 4f36e01e2..a1ca6207b 100644 --- a/js/id/ui/preset_grid.js +++ b/js/id/ui/preset_grid.js @@ -276,9 +276,12 @@ iD.ui.PresetGrid = function(context, entity) { entered.append('div') .attr('class', presetClass); + var geometry = entity.geometry(context.graph()), + fallbackIcon = geometry === 'line' ? 'other-line' : 'marker-stroked'; + entered.append('div') .attr('class', function(d) { - return 'feature-' + (d.icon || 'marker-stroked') + ' icon'; + return 'feature-' + (d.icon || fallbackIcon) + ' icon'; }); entered.append('span') diff --git a/js/id/ui/tag_editor.js b/js/id/ui/tag_editor.js index a629bee83..5c9a1bf90 100644 --- a/js/id/ui/tag_editor.js +++ b/js/id/ui/tag_editor.js @@ -35,10 +35,12 @@ iD.ui.TagEditor = function(context, entity) { event.choose(preset); }); + var fallbackIcon = geometry === 'line' ? 'other-line' : 'marker-stroked'; + back.append('div') .attr('class', 'col12') .append('span') - .attr('class', 'preset-icon icon' + (preset ? ' feature-' + (preset.icon || 'marker-stroked') : '')); + .attr('class', 'preset-icon icon' + (preset ? ' feature-' + (preset.icon || fallbackIcon) : '')); back.append('div') .attr('class', 'col12')