diff --git a/sprites/Makefile b/sprites/Makefile index eb5784d0..774780b6 100644 --- a/sprites/Makefile +++ b/sprites/Makefile @@ -1,6 +1,6 @@ all: - ./target/release/spritegen refill.svg themes/light.json dist/light - ./target/release/spritegen refill.svg themes/dark.json dist/dark - ./target/release/spritegen refill.svg themes/white.json dist/white - ./target/release/spritegen refill.svg themes/grayscale.json dist/grayscale - ./target/release/spritegen refill.svg themes/black.json dist/black \ No newline at end of file + ./target/release/spritegen refill.svg flavors/light.json dist/light + ./target/release/spritegen refill.svg flavors/dark.json dist/dark + ./target/release/spritegen refill.svg flavors/white.json dist/white + ./target/release/spritegen refill.svg flavors/grayscale.json dist/grayscale + ./target/release/spritegen refill.svg flavors/black.json dist/black \ No newline at end of file diff --git a/sprites/README.md b/sprites/README.md index b6df27b9..d0402134 100644 --- a/sprites/README.md +++ b/sprites/README.md @@ -6,8 +6,14 @@ You will need a Rust compiler. To generate spritesheets for the light theme: -`./target/release/spritegen refill.svg themes/light.json dist/light` +`./target/release/spritegen refill.svg flavors/light.json dist/light` Creates `dist/light.json`, `dist/light.png`, `dist/light@2x.json`, `dist/light@2x.png` In the basemaps viewer (run `npm run dev` in `/app`), check the "local sprites" box to load sprites from `/sprites/dist` + +## All Themes + +``` +make all +``` diff --git a/sprites/flavors/black.json b/sprites/flavors/black.json new file mode 100644 index 00000000..dda46e6d --- /dev/null +++ b/sprites/flavors/black.json @@ -0,0 +1,11 @@ +{ + "flavors": { + "base":["#aaaaaa","#000000"], + "arrow":["#666666","#666666"] + }, + "icons": { + "townspot":"base", + "capital":"base", + "arrow":"arrow" + } +} \ No newline at end of file diff --git a/sprites/themes/dark.json b/sprites/flavors/dark.json similarity index 90% rename from sprites/themes/dark.json rename to sprites/flavors/dark.json index 50a2445d..6ea0dd18 100644 --- a/sprites/themes/dark.json +++ b/sprites/flavors/dark.json @@ -1,6 +1,7 @@ { - "themes": { + "flavors": { "base":["#aaaaaa","#000000"], + "arrow":["#666666","#666666"], "green":["#30C573", "#1F1F1F"], "lapis": ["#2B5CEA", "#1F1F1F"], "slategray": ["#93939F", "#1F1F1F"] @@ -8,6 +9,7 @@ "icons": { "townspot":"base", "capital":"base", + "arrow":"arrow", "beach":"green", "forest":"green", "marina":"green", diff --git a/sprites/flavors/grayscale.json b/sprites/flavors/grayscale.json new file mode 100644 index 00000000..fa576dae --- /dev/null +++ b/sprites/flavors/grayscale.json @@ -0,0 +1,11 @@ +{ + "flavors": { + "base":["#444444","#dddddd"], + "arrow":["#999999","#999999"] + }, + "icons": { + "townspot":"base", + "capital":"base", + "arrow":"arrow" + } +} \ No newline at end of file diff --git a/sprites/themes/light.json b/sprites/flavors/light.json similarity index 90% rename from sprites/themes/light.json rename to sprites/flavors/light.json index e5313592..b3f87f37 100644 --- a/sprites/themes/light.json +++ b/sprites/flavors/light.json @@ -1,6 +1,7 @@ { - "themes": { + "flavors": { "base":["#555555","#ffffff"], + "arrow":["#cccccc","#cccccc"], "green":["#20834D", "#DEF7EA"], "lapis": ["#315BCF", "#DFEAF4"], "slategray": ["#6A5B8F", "#E1F2FF"] @@ -8,6 +9,7 @@ "icons": { "townspot":"base", "capital":"base", + "arrow": "arrow", "beach":"green", "forest":"green", "marina":"green", diff --git a/sprites/flavors/white.json b/sprites/flavors/white.json new file mode 100644 index 00000000..a86a88c8 --- /dev/null +++ b/sprites/flavors/white.json @@ -0,0 +1,11 @@ +{ + "flavors": { + "base":["#888888","#ffffff"], + "arrow":["#bbbbbb","#bbbbbb"] + }, + "icons": { + "townspot":"base", + "capital":"base", + "arrow":"arrow" + } +} \ No newline at end of file diff --git a/sprites/refill.svg b/sprites/refill.svg index c9db2b6d..18f4224c 100644 --- a/sprites/refill.svg +++ b/sprites/refill.svg @@ -1 +1,13908 @@ -sdk_solid_shield-5charsdk_solid_shield-4charsdk_solid_shield-3charsdk_solid_shield-2charsdk_solid_shield-1charUS:IUS:USUS:USUS:USUS:USUS:USUS:USUS:IUS:IUS:IUS:Isdk_shield-2charsdk_shield-3charsdk_shield-4charsdk_shield-5charsdk_shield-1chargeneric shieldgeneric shieldgeneric shieldgeneric shieldgeneric shieldtownspot XLtownspot Ltownspot Mtownspot Stownspot XStownspot XL revtownspot L revtownspot M revtownspot S revtownspot XS revcapital XLux-transit-stopcapital Lcapital Mcapital Scapital XSsdk_crosssdk_heartsdk_squaresdk_square_strokedsdk_circlesdk_circle_strokedsdk_trianglesdk_triangle_strokedsdk_starsdk_star_strokedsdk_markersdk_marker_alt1sdk_marker_stroked_alt1closedsdk_marker_strokedgenericgeneric_revattractionarrowinformationpizzaice_creamhot_dog_jointbiergartendrinking_waterdrinking_water_wellwater_well_drinking_water_no_pumpwater_well_no_pumpwater_well_pump_autowater_well_drinking_water_pump_autowater_well_drinking_water_pump_manualwater_well_pump_manualwater_pointwatering_placebeverageswinewine_shopbagel_shopnoodle_shopramenfast_foodtaqueriarestaurantdonutforestglacierhanamisinkholestonehot_pot_restaurantconfectionerycheese_shopbreakfaststeakhousebbqfueltraffic_signalscollegefootball_stadiumsoccer_stadiumclothescinemaaquariumcarouselviewpointroller_coasterbowling_alleygamingstorage_tankstreet_lamppotterycomedy_clubhandicraftconcert_hallbasketball_stadiummusic_venuetheatreenclosuredambarrierswing_gategatecycle_barrierwildlife_parklockmazesummer_toboggantelecommunicationemployment_agencypedestrianvillage_greencavereefgalleryartarts_centreartworknightlifebakerycafeteahousechinese_restaurantcarribean_restaurantgastropubcupcake_shopfried_chicken_jointgerman_restaurantsoup_placetea_roomwinerywings_jointbuildingfactoryfarmlandhealth_centrepost_officeplace_of_worshipwayside_shrinehindubargay_barloungewhisky_barsports_centreamerican_footballcricketgolfhorse_ridinggamblingminiature_golfgovernmentanimalmarinaharborentrancekaraokewheelchairbureau_de_changemoney_transfercopyshopplumbergardenerlawyernotarymetal_constructionstonemasonaccountantfire_hydrantpower_towerpower_tower_smallliftgatepower_poleentrance_alt1vineyardcar_repaircar_partsbankatmATMlogging_alt1loggingslaughterhousesuitcasecarpenterfuneral_directorscraftstudiobicycle_rentalbicyclebookscamera_storecarcar_sharingconsultingdepartment_storecharging_stationparkingbicycle_parkingtaxielectronicstax_advisorfarmers_marketfish_marketfood_courtsupermarketliquorfurniture_storeswimming_poolstadiumtracktennisskiski_jumpingski_rentalski_schoolfountainparkparkchristiansushi_restaurantfloristdeliservice_areagifthistoricalmuseumpool_halltheme_parkmarketplacezoobridgetoiletsparking_garageroadblockonewayoneway-reversecliffrapid egress put_in put_in_egress urbanhazardmotorcycle_parkingbollardmotorway_junctioncamp_sitebuddhistcemeterygrave_yard_christiangrave_yard_genericgrave_yard_jewishgrave_yard_muslimshintoistsikhisttaoistwayside_crossreligionfarmlandusenaturalpark_alt1warehousealpine_hutguest_househunting_standplace_squarechaletwilderness_hutpylonrefugee_campresortworkshoplife_ringsnow_cannonsnow_fencebreakwatergroynewindmillhomemeadowgardenbeachbeach_resortnightclubtelephonewaste_basketbucketcommunication_towergenerator_nucleargenerator_solargenerator_windcommunicationslifeguard_toweroffshore_platformpetroleum_wellpetting_zoorest_areatoll_boothwaste_disposalgroup_homemastsoup_kitchentrail_riding_stationdairy_kitchenfootwaywalking_junctionbunkerofficeschoolbaseballbasketballgolf_coursehockey_fieldskate_parkskating_rinksoccervolleyball_courtaviarylandsaddlespringlighthousepeakboat_storagebattlefieldwater_parkwater_slidescrubtrailheadoutdoorcategory-namespace-do_and_see,category-predicate-attractioncategory-namespace-eat_and_drinkcategory-namespace-education_and_religioncategory-namespace-healthcategory-namespace-mobilitycategory-namespace-othercategory-predicate-addressingcategory-predicate-civic category-predicate-drinkcategory-predicate-funcategory-predicate-industrycategory-predicate-moneycategory-predicate-naturecategory-predicate-religioncategory-predicate-servicecategory-predicate-shopcategory-predicate-sleepcategory-predicate-transportscuba_divinggas_canisterrocktelescopeboat_rentalallotmentsretaining_wallrecreation_trackwater_towermotorcyclepicnic_sitepicnic_tableranger_stationbbqwaterfalldog_parkfirepitswimming_areafishingcaravan_siteshowergarden_centrewetlandwaterwatermillassisted_livingvolcanoadult_boutiqueantique_shoparts_craftsstationerytravel_agencysurf_shopconveniencecosmetics_shopdry_cleaningbeautycosmeticsperfumerychildcarechildrens_centreresearchpharmacytradebutchersushigreengrocerseafoodcoffeeteafood_bankgarden_centerfitnesshardwaremineshafthobby_shophunting_supplyITjewelrylaundrymarijuana_dispensaryvariety_storeretailshoemakermiscellaneous_shopmobile_phoneplaygroundscreepost_boxdunebridal_shopfinancialmusicnail_salonnewspapercommercialshoptyreshifimusical_instrumentnewsagentshoestobaccobagopticianblood_bankdefibrillatorheartchildrens_hospitaltherapistambulatory_caremidwifebicycle_repair_stationpetphotographic_laboratoryphotograherestate_agentrecord_shoprecyclingdangeremergency_phoneprisonresidential_communitysheltertown_hallborder_controlcommunity_centresocial_facilityacraacra_alt1ngooxfamplaqueobeliskmilitarypolling_placeassociationcity_wallcommonoutreachpolitical_partyhairdressersmoke_shopspa_massagesportselectriciantailortanning_salontattoo_parlordressmakertoysarchitectairportferrybus_stationhvachotellight_railsawmillpiercar_rentalrest_areabenchdot whitedot blackindustryruinbuilding_alt1roadfordrail_metrocar_washsubway_entranceaerialwayairfieldheliportrocketscootersnowmobileelevatoraeroway_gatehelipadhaltrailwayrunwayfordmini_roundabouttaxiwaytrain_stationtrainanimal_sheltercourthousefire_stationlandmarkpolicedentistclinichospitalveterinaryveterinary_dogmuslimjewishdessertlibrarygeyserhuntingbeach_coarseorchardplant_nurseryruralminetree-streelevel_crossing2level_crossingslipwayRELIGOUSTRANSITCAR & BIKEAMENITIES IIINATURALCIVICHEALTHEDUCATIONAMENITIES IAMENITIES IIPERSONAL CARESHOPPING ISHOPPING IISHOPPING IIISHOPPING IIIPETSSPORTS ISPORTS IIFOOD SHOPPINGDRINKINGEATING IEATING IISNACKINGARTSGENERICOUTDOORCATEGORIES0.70.10.10.10.10.10.10.10.10.20.20.60.20.20.20.20.20.20.20.20.20.20.20.20.20.20.20.70.20.20.20.20.10.10.10.80.80.81.0???????????????????????????0.11????????????????????????????????????????????????????????????????????????????????????????????????????????????????xxxxx???surf spot only???????????????????????????????????????building=stable?????????????????????0.90.100.10 trailhead??? + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + sdk_solid_shield-5char + + + + + + sdk_solid_shield-4char + + + + + + sdk_solid_shield-3char + + + + + + sdk_solid_shield-2char + + + + + + sdk_solid_shield-1char + + + + + + US:I + + + + + + + + US:US + + + + + US:US + + + + US:US + + + + + + US:US + + + + + + US:US + + + + + + US:US + + + + + + US:I + + + + + + + + US:I + + + + + + + + US:I + + + + + + + + US:I + + + + + + + + sdk_shield-2char + + + + + + + sdk_shield-3char + + + + + + + sdk_shield-4char + + + + + + + sdk_shield-5char + + + + + + + sdk_shield-1char + + + + + + + gene + r + ic shield + + + + + + gene + r + ic shield + + + + + + gene + r + ic shield + + + + + + gene + r + ic shield + + + + + + gene + r + ic shield + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + to + wnspot XL + + + + + + to + wnspot L + + + + + + to + wnspot M + + + + + + to + wnspot S + + + + + + to + wnspot XS + + + + + + to + wnspot XL + r + ev + + + + + + + + + + to + wnspot L + r + ev + + + + + + + + + + to + wnspot M + r + ev + + + + + + + + + + to + wnspot S + r + ev + + + + + + + + + + to + wnspot XS + r + ev + + + + + + + + + + capital XL + + + + + + + + + + + u + x + -t + r + ansi + t + -s + t + op + + + + + + + + + + + capital L + + + + + + + + + + + capital M + + + + + + + + + + + capital S + + + + + + + + + + + capital XS + + + + + + + + + + + sdk_c + r + oss + + + + + + + + + sdk_hea + r + t + + + + + + + + sdk_squa + r + e + + + + + + + + sdk_squa + r + e_st + r + oked + + + + + + + + + sdk_ci + r + cle + + + + + + + + sdk_ci + r + cle_st + r + oked + + + + + + + + + sdk_t + r + iangle + + + + + + + + sdk_t + r + iangle_st + r + oked + + + + + + + + + sdk_star + + + + + + + + sdk_star_st + r + oked + + + + + + + + + sdk_ma + r + ker + + + + + + + + sdk_ma + r + ker_alt1 + + + + + + + + sdk_ma + r + ker_st + r + oked_alt1 + + + + + + + + + + + + + + + + + closed + + + + + sdk_ma + r + ker_st + r + oked + + + + + + + + + gene + r + ic + + + + + + + gene + r + ic_ + r + ev + + + + + + + + a + tt + r + a + c + tion + + + + + + a + r + r + o + w + + + + + + + + in + f + o + r + m + a + tion + + + + + + + + + pizza + + + + + + + i + c + e_c + r + eam + + + + + + + hot_dog_joi + n + t + + + + + + + bie + r + ga + r + t + en + + + + + + + + + + + + d + r + in + k + ing_ + wa + t + er + + + + + + + + d + r + in + k + ing_ + wa + t + er_ + w + ell + + + + + + + + + + + + + wa + t + er_ + w + ell_d + r + in + k + ing_ + wa + t + er_no_pump + + + + + + + + + + + + + + + + + + + + + + + + + + wa + t + er_ + w + ell_no_pump + + + + + + + + + + + + + + + + + + + + + + + + + + wa + t + er_ + w + ell_ + pump_au + t + o + + + + + + + + + + + + + + + + wa + t + er_ + w + ell_d + r + in + k + ing + _ + wa + t + er_pump_au + t + o + + + + + + + + + + + + + + + + wa + t + er_ + w + ell_d + r + in + k + ing + _ + wa + t + er_pump_manual + + + + + + + + + + + + + wa + t + er_ + w + ell_ + pump_manual + + + + + + + + + + + + + + + + + + + + wa + t + er_poi + n + t + + + + + + + + + + + wa + t + e + r + ing_pla + c + e + + + + + + be + v + e + r + ages + + + + + + + + + + + + + + + + + + wine + + + + + + + + + + wine_shop + + + + + + bagel_shop + + + + + + noodle_shop + + + + + + r + amen + + + + + + + fast_ + f + ood + + + + + + + + + + taque + r + ia + + + + + + + + + + + + + + + + + + + + + r + estau + r + a + n + t + + + + + + + + + donut + + + + + + + f + o + r + est + + + + + + + + + + + + + glacier + + + + + + + + + + + + + + + + + + + + + + + + + + + + + hanami + + + + + + + + + + + + + + + + + sin + k + hole + + + + + + + + s + t + one + + + + + hot_pot_ + r + estau + r + a + n + t + + + + + + + c + on + f + e + c + tione + r + y + + + + + + + + + cheese_shop + + + + + + b + r + eakfast + + + + + + s + t + ea + k + house + + + + + + bbq + + + + + + + fuel + + + + + + + + + + t + r + affic_si + g + nals + + + + + + + + + + + + + + + + c + ollege + + + + + + + + + f + ootball_stadium + + + + + + so + cc + er_stadium + + + + + + + clothes + + + + + + + + + + cinema + + + + + + + + + + + + + + + aqua + r + ium + + + + + + + + + + + + + + + + + + + + + + + + ca + r + ousel + + + + + + viewpoi + n + t + + + + + + + + + + + + + + + + + + + + + + + + + r + oller_ + c + oas + t + er + + + + + b + o + wling_alley + + + + + + gaming + + + + + + + + + + + + s + t + o + r + age_tank + + + + + + + + + + + + + + + + + + + st + r + eet_lamp + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + pot + t + e + r + y + + + + + c + omedy_club + + + + + + + + + + + + + + + + + + + handic + r + a + f + t + + + + + c + on + c + e + r + t_hall + + + + + + basketball_stadium + + + + + + music_ + v + enue + + + + + + + the + a + t + r + e + + + + + + + + + + + + + enclosu + r + e + + + + + + + + + + + + + + + + + + dam + + + + + + + + + + + + + + + + + + + + + ba + rr + ier + + + + + + + + + + + + + + swing_g + a + t + e + + + + + + + + + + + + + + + + + + + + g + a + t + e + + + + + + + + + + + + + + + + + + + + + + + + + c + y + cle_ba + rr + ier + + + + + + + + + + + + + + + + + + + + + wildli + f + e_pa + r + k + + + + + + + + + + + + + + + + + + + + + + + lock + + + + + + + + + + + + + + + + + + + + + ma + z + e + + + + + + + + + + + summer_ + t + oboggan + + + + + + + + + + + + + t + ele + c + ommunic + a + tion + + + + + + + + + + + + empl + o + yme + n + t_agen + c + y + + + + + + + + + + + + + + pedest + r + ian + + + + + + + + + + + + + + + + + + + + + + + + + village_ + g + r + een + + + + + c + a + v + e + + + + + + + + + + + + + + + + r + eef + + + + + + + + + + + + galle + r + y + + + + + + + + + + + + a + r + t + + + + + + + + + + + + + + + + + + + a + r + ts_ + c + e + n + t + r + e + + + + + + + + + + + + + + + + + a + r + t + w + o + r + k + + + + + nig + h + tli + f + e + + + + + + + bake + r + y + + + + + + + + + + + + ca + f + e + + + + + + + + + t + eahouse + + + + + + + + + + + + chinese_ + r + estau + r + a + n + t + + + + + + ca + rr + ibean_ + r + estau + r + a + n + t + + + + + + gast + r + opub + + + + + + cupcake_shop + + + + + + f + r + ied_chicken_joi + n + t + + + + + + ge + r + man_ + r + estau + r + a + n + t + + + + + + soup_pla + c + e + + + + + + t + ea_ + r + oom + + + + + + + wine + r + y + + + + + + + + + + + + + + wings_joi + n + t + + + + + + + building + + + + + + + + + + + + + + + + + + fa + c + t + o + r + y + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + fa + r + mland + + + + + health_ + c + e + n + t + r + e + + + + + + + + + post_offi + c + e + + + + + + + + + + pla + c + e_of_ + w + orship + + + + + + + + + + + + + + + w + a + y + side_sh + r + ine + + + + + + + + + + + + + + + + + + + + + + + + + + + + hindu + + + + + + + + + + + + + bar + + + + + + + + + g + a + y_bar + + + + + + lounge + + + + + + whis + k + y_bar + + + + + + + spo + r + ts_ + c + e + n + t + r + e + + + + + + + + + + + ame + r + ican_ + f + ootball + + + + + + + + + + + + + c + r + icket + + + + + + + + + + + + + golf + + + + + + + + + + + + + horse_ + r + iding + + + + + + + + + + + + gambling + + + + + + + + + + + + + + + mini + a + tu + r + e_golf + + + + + + + + + + + + + + + + + + + + + + + + + + g + o + v + e + r + nme + n + t + + + + + + + + + + + + + + + + + + + + + animal + + + + + + ma + r + ina + + + + + + + + + + + + ha + r + bor + + + + + + + + + + + + + + + + e + n + t + r + an + c + e + + + + + + + + + + + + k + a + r + aoke + + + + + + + + wheelchair + + + + + + + + + + + + + + bu + r + eau_de_change + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + money_t + r + ans + f + er + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + c + o + py + shop + + + + + + + + + + + + + + + + + + + + + + + plumber + + + + + + + + + + + + + ga + r + dener + + + + + + + + + + + + + + l + a + w + y + er + + + + + + + + + + + + + + + + + + + + + + + + nota + r + y + + + + + + + + + + + + + + + + metal_ + c + onstru + c + tion + + + + + + + + + + + s + t + onemason + + + + + + + + + + + + + + + + + + a + cc + ou + n + ta + n + t + + + + + + + fi + r + e_ + h + y + d + r + a + n + t + + + + + + + + + + + + + + p + o + w + er_ + to + w + er + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + p + o + w + er_ + to + w + er_small + + + + + + + + + + + + + + + + + + + + + + + + + + + + + li + f + t + g + a + t + e + + + + + + p + o + w + er_pole + + + + + + + + + + + + + + + + + + + + + + + + + e + n + t + r + an + c + e_alt1 + + + + + + + + + + + + vine + y + a + r + d + + + + + + + + + + + + + + + car_ + r + epair + + + + + + + + + + car_pa + r + ts + + + + + + + + + + + + + + + + bank + + + + + + + + + a + tm + + ATM + + + + + + log + g + ing_alt1 + + + + + + + + + + + + + + + + + + + + + + + + log + g + ing + + + + + + + + + + + + + + + + + + + + slaug + h + t + e + r + house + + + + + + + + + + + + + + + + + + + + + + + sui + t + case + + + + + + ca + r + pe + n + t + er + + + + + + + + + + + + + + fune + r + al_di + r + e + c + t + ors + + + + + + + + + + + + + + + + + + c + r + a + f + t + + + + + + + + + + + + + + + + studio + + + + + + + + + + bi + c + y + cle_ + r + e + n + tal + + + + + + + + + + + + + + + + + + + bi + c + y + cle + + + + + + + + + + + + books + + + + + + + + came + r + a_s + t + o + r + e + + + + + + + car + + + + + + car_sha + r + ing + + + + + + + + + + + + + + + + + + + + + + + + + + + + c + onsulting + + + + + + depa + r + tme + n + t_s + t + o + r + e + + + + + + + cha + r + g + ing_st + a + tion + + + + + + + + + + + + + + pa + r + k + ing + + + + + + + bi + c + y + cle_pa + r + k + ing + + + + + + + + + + + + + taxi + + + + + + + + + + + + + + + + ele + c + t + r + onics + + + + + + + + + + + + + + + + + + + + tax_advisor + + + + + fa + r + mers_ma + r + ket + + + + + + fish_ma + r + ket + + + + + + f + ood_ + c + ou + r + t + + + + + + + supe + r + ma + r + ket + + + + + + + + + + + + + + liquor + + + + + + + + + + + fu + r + nitu + r + e_s + t + o + r + e + + + + + + + + + + + + + swimming_pool + + + + + + + + + + + + + + + + + stadium + + + + + + + + + + + + + + + t + r + ack + + + + + + + t + ennis + + + + + + + + + s + k + i + + + + + + + + + + + s + k + i_jumping + + + + + + + + + + + + s + k + i_ + r + e + n + tal + + + + + + + + + + + + + + + + s + k + i_school + + + + + + + + + + + + + + + + + + + + + + + f + ou + n + tain + + + + + + + + + + + + + + pa + r + k + + + + + + pa + r + k + + + + + + + + + + + + + + + ch + r + istian + + + + + + sushi_ + r + estau + r + a + n + t + + + + + + + flo + r + ist + + + + + + + deli + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + se + r + vi + c + e_a + r + ea + + + + + + + + + + + g + i + f + t + + + + + + his + t + o + r + ical + + + + + + + + museum + + + + + + + + + + + + pool_hall + + + + + + + theme_pa + r + k + + + + + + + + + + + + + + + + + + + + ma + r + ketpla + c + e + + + + + + + + + + + + + + + + + + + + + + + + z + oo + + + + + + + + + + + + b + r + idge + + + + + + + + + + t + oilets + + + + + + + + + + pa + r + k + ing_ga + r + age + + + + + + + + + + + r + oadblock + + + + + + + + one + w + a + y + + + + + + + + + + one + w + a + y + - + r + e + v + erse + + + + + + + + + cliff + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + r + apid + + + + + + + + + + + + + + + e + g + r + ess + + + + + + + + + + + + + + + put_in + + + + + + + + + + + + + + + + + + + + + put_in_e + g + r + ess + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + u + r + ban + + + + + + + + + + + haza + r + d + + + + + mo + t + o + r + c + y + cle_pa + r + k + ing + + + + + + + + + + + + + + + + + + + + + + + + + + bolla + r + d + + + + + + + + + + + + + + + + + + mo + t + o + r + w + a + y_jun + c + tion + + + + + + camp_si + t + e + + + + + + + + + buddhist + + + + + + c + eme + t + e + r + y + + + + + + + + + + gr + a + v + e_ + y + a + r + d_ch + r + istian + + + + + + + + + + + gr + a + v + e_ + y + a + r + d_gene + r + ic + + + + + + + + + + + gr + a + v + e_ + y + a + r + d_jewish + + + + + + + + + + + + + gr + a + v + e_ + y + a + r + d_muslim + + + + + + + + + + + shi + n + t + oist + + + + + + + + + + + + + si + k + hist + + + + + + + + + + + + + + + + + + + + + + + + taoist + + + + + + + + + + + + + + + + + + + w + a + y + side_c + r + oss + + + + + + + + + + + + + + + + + + + + + + + + + + + + r + eli + g + ion + + + + + fa + r + m + + + + + + + + + + + + + + + landuse + + + + + + + + + + + + + + + + n + a + tu + r + al + + + + + + + + + + + + + pa + r + k_alt1 + + + + + + + + + + w + a + r + ehouse + + + + + + + + + + + + + + + + + alpine_hut + + + + + + + + + + + + + + + + + + + + guest_house + + + + + + + + + + + + + + + + + + + hu + n + ting_stand + + + + + + + + + + + + pla + c + e_squa + r + e + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + chalet + + + + + + + + + + + + + + + + + + + + + + + + wilde + r + ness_hut + + + + + + + + + + + + + + p + ylon + + + + + + + + + + + + + + + + + + r + efugee_camp + + + + + + + + + + + + + + + + + + + + + + + + + r + eso + r + t + + + + + + + + + + + + + + + + + + + + + + + + + + + w + o + r + kshop + + + + + + + + + + + + + + + + li + f + e_ + r + ing + + + + + + + + + + + + + + + + + + + + sn + o + w_cannon + + + + + + + + + + + + + + + + + + + sn + o + w_ + f + en + c + e + + + + + + + + + + + + + + + + + + + + + + + + b + r + ea + k + wa + t + er + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + g + r + o + yne + + + + + + + + + + + + + + + + + + + + + + + + + + + windmill + + + + + home + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + mead + o + w + + + + + + ga + r + den + + + + + + + + + + beach + + + + + + + + + + + + beach_ + r + eso + r + t + + + + + + + + + + + + nig + h + t + club + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + t + elephone + + + + + + + + + + + w + as + t + e_basket + + + + + + + + + + + bucket + + + + + + + + + + + c + ommunic + a + tion_ + t + o + w + er + + + + + + + + + + + + + + + + + + + + + + + + gene + rat + or_nuclear + + + + + + + + + + + gene + rat + or_solar + + + + + + + + + + + + + + + + + + + + + + + + + gene + rat + or_wind + + + + + + + + + + + + + + c + ommunic + a + tions + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + li + f + egua + r + d_ + to + w + er + + + + + + + + + + + + + + + + + + + + + + + + + o + ff + sho + r + e_pl + a + t + f + o + r + m + + + + + + + + + + + + + + + + + + + + pet + r + oleum_ + w + ell + + + + + + + + + + + + + + + petting_ + z + oo + + + + + + + + + + + + + r + est_a + r + ea + + + + + + + + + + + + + + + + + + + t + oll_booth + + + + + + + + + + + + + + + + + + + + + + + + + + + + w + as + t + e_disposal + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + g + r + oup_home + + + + + + + + + + + mast + + + + + + + + + + + + + + + + + + + + + + + soup_ + k + i + t + chen + + + + + + + + + + + + + + + + + + t + r + ail_ + r + iding_st + a + tion + + + + + + + + + + + + + + + + + + dai + r + y_ + k + i + t + chen + + + + + + + + + + + + + + + f + oo + t + w + a + y + + + + + + + + + + + + + + + + + + + + + w + al + k + ing_jun + c + tion + + + + + + bunker + + + + + + + + + offi + c + e + + + + + + + + + + + + + + + + school + + + + + + + + + + + + + + + + + + baseball + + + + + + + + + basketball + + + + + + + + + + + golf_ + c + ourse + + + + + + + + + + + hockey_field + + + + + + s + k + a + t + e_pa + r + k + + + + + + s + k + a + ting_ + r + ink + + + + + + + so + cc + er + + + + + + + + + + + + v + olleyball_ + c + ou + r + t + + + + + + + + + + + + + + + + + a + via + r + y + + + + + + + + + + + + + + + + + + + land + + + + + + + + + + + + + saddle + + + + + + sp + r + ing + + + + + + + + + + lig + h + thouse + + + + + + + + + + + peak + + + + + + + + + + + + + + + + + + + + + + + + bo + a + t_s + t + o + r + age + + + + + b + a + ttlefield + + + + + + + + + + + + + + + + + wa + t + er_pa + r + k + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + wa + t + er_slide + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + scrub + + + + + t + r + ailhead + + + + + + + + + + + + + + + ou + t + door + + + + + + + + + + + + + + + + + + + + + + + c + a + t + ego + r + y + -namespa + c + e + - + do_and_se + e + , + c + a + t + ego + r + y + -p + r + edic + a + t + e + - + a + tt + r + a + c + tion + + + + + + + + + + + + + + + + + + + + + + c + a + t + ego + r + y + -namespa + c + e + - + e + a + t_and_d + r + ink + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + c + a + t + ego + r + y + -namespa + c + e + - + educ + a + tion_and_ + r + eli + g + ion + + + + + + + + + + + + + + + + + c + a + t + ego + r + y + -namespa + c + e + -health + + + + + + + + + + + + + + + + + c + a + t + ego + r + y + -namespa + c + e + -mobili + t + y + + + + + + + + + + + + + c + a + t + ego + r + y + -namespa + c + e + - + other + + + + + + + + + + + + + + + + + + + + + + + c + a + t + ego + r + y + -p + r + edic + a + t + e + -add + r + essing + + + + + + + + + + + + + + + + + + + + + + c + a + t + ego + r + y + -p + r + edic + a + t + e + - + civic + + + + + + + + + + + + + + + + + + + + c + a + t + ego + r + y + -p + r + edic + a + t + e + - + d + r + ink + + + + + + + + + + + + + + + + + + + + + + + + + + + c + a + t + ego + r + y + -p + r + edic + a + t + e + -fun + + + + + + + + + + + + + + + + + + + + + c + a + t + ego + r + y + -p + r + edic + a + t + e + -indust + r + y + + + + + + + + + + + + + + + + + + + + + + + c + a + t + ego + r + y + -p + r + edic + a + t + e + -money + + + + + + + + + + + + + + + + + c + a + t + ego + r + y + -p + r + edic + a + t + e + -n + a + tu + r + e + + + + + + + + + + + + + + + + + + + + + + + + + + + c + a + t + ego + r + y + -p + r + edic + a + t + e + - + r + eli + g + ion + + + + + + + + + + + + + + + + + + + + + + c + a + t + ego + r + y + -p + r + edic + a + t + e + -se + r + vi + c + e + + + + + + + + + + + + + + + + + + + + + + + + c + a + t + ego + r + y + -p + r + edic + a + t + e + -shop + + + + + + + + + + + + + + + + + + + + c + a + t + ego + r + y + -p + r + edic + a + t + e + -sleep + + + + + + + + + + + + + + + + + + + + + + + + + + c + a + t + ego + r + y + -p + r + edic + a + t + e + -t + r + anspo + r + t + + + + + scuba_diving + + + + + + + + + + + + + + + + + + + + + + + + + gas_canis + t + er + + + + + + + + + + + + + + + + r + ock + + + + + t + eles + c + ope + + + + + + + + + + + + + + bo + a + t_ + r + e + n + tal + + + + + + + + + + + + + allotme + n + ts + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + r + etaining_ + w + all + + + + + r + ec + r + e + a + tion_t + r + ack + + + + + + + wa + t + er_ + t + o + w + er + + + + + + + + + + + + mo + t + o + r + c + y + cle + + + + + + + + + + + + + + + + + + + picnic_si + t + e + + + + + + + + + + + + + + + + + + + + + + + + + + + + picnic_table + + + + + + + + + + + + + + r + anger_st + a + tion + + + + + + + + + + + + + + + + + + + + bbq + + + + + + + + + + + + + + + wa + t + e + r + fall + + + + + + + + + + + + + + + + + + + + + + + + + dog_pa + r + k + + + + + + + + + + + + + fi + r + epit + + + + + + + + + + + + + + + + swimming_a + r + ea + + + + + + + + + + + + + + + + + fishing + + + + + + + + + + + + + + + + ca + r + a + v + an_si + t + e + + + + + + + + + + + + + + + + sh + o + w + er + + + + + + + + + + + + + + + + ga + r + den_ + c + e + n + t + r + e + + + + + + + + + + + + + + + + + + + + + w + etland + + + + + + + + + + + + + + + + + + + wa + t + er + + + + + + + + + + + + + + + + + + + + + + + wa + t + e + r + mill + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + assis + t + ed_living + + + + + + v + olcano + + + + + + + + adult_boutique + + + + + + a + n + tique_shop + + + + + + a + r + ts_c + r + a + f + ts + + + + + + st + a + tione + r + y + + + + + + + + + + + + t + r + a + v + el_agen + c + y + + + + + + + + + + + + + + + su + r + f_shop + + + + + + + c + o + n + v + enien + c + e + + + + + + + + + + + + c + osmetics_shop + + + + + + + d + r + y_cleaning + + + + + + + + beau + t + y + + + + + + + + + + + c + osmetics + + + + + + + + + + + + + pe + r + fume + r + y + + + + + + + + + + + + + + + + + + + + + childca + r + e + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + child + r + ens_ + c + e + n + t + r + e + + + + + + + + + + + + + + + r + esea + r + ch + + + + + + pha + r + ma + c + y + + + + + + + + + + + + + + + + + + t + r + ade + + + + + + bu + t + cher + + + + + + + + + sushi + + + + + + + + + + + + + + + + g + r + een + g + r + o + c + er + + + + + + + + + + + + + + + sea + f + ood + + + + + + + + + + + + + + + + + + c + o + ff + ee + + + + + + + + + + t + ea + + + + + + + + + + + + + + + + + + + + + + + f + ood_bank + + + + + ga + r + den_ + c + e + n + t + er + + + + + + + fitness + + + + + + + + + + + ha + r + d + w + a + r + e + + + + + + + + + minesha + f + t + + + + + + + + + + hob + b + y_shop + + + + + + hu + n + ting_supply + + + + + + + + + + + IT + + + + + + je + w + el + r + y + + + + + + + + + + + + laund + r + y + + + + + + + + ma + r + ijuana_dispensa + r + y + + + + + + v + a + r + ie + t + y_s + t + o + r + e + + + + + + + + + + + + + + + + + + + + r + etail + + + + + + + + + + + + shoemaker + + + + + + + + + + mis + c + ellaneous_shop + + + + + + + mobile_phone + + + + + + + + + + + + + pl + a + y + g + r + ound + + + + + + + + + + + + + + + + + + + + + + + sc + r + ee + + + + + + + + + + + + + + + + post_b + o + x + + + + + + + + + + + + + + + + dune + + + + + b + r + idal_shop + + + + + + + + + + + + + + + + financial + + + + + + music + + + + + + + + + + nail_salon + + + + + + + ne + w + spaper + + + + + + + + + + + + + + + + c + omme + r + cial + + + + + + + + + + + + + + + + + + shop + + + + + + + + + + t + y + r + es + + + + + + + + + + + + + hifi + + + + + + + + + + musical_instrume + n + t + + + + + + + + + + + + + + + ne + w + sage + n + t + + + + + + + + + + + + + + + + + + + shoes + + + + + + + + + + + + + + + + + + + t + oba + cc + o + + + + + + + + + bag + + + + + + + + + + + + + + optician + + + + + + + + + + + blood_bank + + + + + + + + + defib + r + ill + a + t + or + + + + + + + + + + + + + + + + hea + r + t + + + + + + + child + r + ens_hospital + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + the + r + apist + + + + + + + + + + + + + + + ambul + a + t + o + r + y_ca + r + e + + + + + + + + + + + + + + + + + + + + + midwi + f + e + + + + + + + + + + + + + + + + + + + + bi + c + y + cle_ + r + epair_st + a + tion + + + + + + pet + + + + + + + pho + t + o + g + r + aphic_ + labo + rat + o + r + y + + + + + + + + pho + t + o + g + r + aher + + + + + + + + + + + + est + a + t + e_age + n + t + + + + + + + r + e + c + o + r + d_shop + + + + + + + r + e + c + y + cling + + + + + + + + + + + + danger + + + + + + + + + + + + + + + + + + + eme + r + gen + c + y_phone + + + + + + + + + + + + p + r + ison + + + + + + + + + + + + + + r + eside + n + tial_ + c + ommuni + t + y + + + + + + + + + + + + + + shel + t + er + + + + + + + to + wn_hall + + + + + + + + + + + + + + + + + + + bo + r + der_ + c + o + n + t + r + ol + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + c + ommuni + t + y_ + c + e + n + t + r + e + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + social_facili + t + y + + + + + + + + + + + + + + + + + + + + + + + + + + + + ac + r + a + + + + + + + + + + + + + + + + + ac + r + a_alt1 + + + + + + + + + + + + + + + + + + + + + + + ngo + + + + + + + + + + + + + + + + + + + o + xfam + + + + + + + + + + plaque + + + + + + + + + + + + + + obelisk + + + + + + + + + + + milita + r + y + + + + + + + + + + + + + + + + + + + polling_pla + c + e + + + + + + associ + a + tion + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ci + t + y_ + w + all + + + + + + + + + + + + + + + + c + ommon + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + out + r + each + + + + + + + + + + + + + + + + political_pa + r + t + y + + + + + + hai + r + d + r + esser + + + + + + + + + + + + + + + smoke_shop + + + + + + spa_massage + + + + + + + spo + r + ts + + + + + + + + + + + + + + + + + + + ele + c + t + r + ician + + + + + + tailor + + + + + + + + + tanning_salon + + + + + + t + a + t + t + oo_pa + r + lor + + + + + + + + + + + + + + d + r + essmaker + + + + + + toy + s + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + a + r + chi + t + e + c + t + + + + + + ai + r + po + r + t + + + + + + + f + e + r + r + y + + + + + + + + + + + bus_st + a + tion + + + + + + + + + + + + + + + + + + + + + + + + + + + + + h + v + ac + + + + + + ho + t + el + + + + + + + + + + + + + + + lig + h + t_ + r + ail + + + + + + + + + + + + + + + + + + + + + + + + + s + a + wmill + + + + + + pier + + + + + + + + + + + + + + car_ + r + e + n + tal + + + + + + + + r + est_a + r + ea + + + + + + + bench + + + + + + + + + + dot whi + t + e + + + + + + + + dot black + + + + + + + indust + r + y + + + + + + + + + + + + ruin + + + + + + + + + + building_alt1 + + + + + + + + + + + r + oad + + + + + + f + o + r + d + + + + + + r + ail_met + r + o + + + + + + + + + + + + + + car_ + w + ash + + + + + + + + + + + su + b + w + a + y_e + n + t + r + an + c + e + + + + + + + + ae + r + ial + w + a + y + + + + + + + + + + + + + + + ai + r + field + + + + + + + + + + + + + + + helipo + r + t + + + + + + + + + + + + + r + ocket + + + + + + + + + + + + + + + + + + + + s + c + oo + t + er + + + + + + + + + + + + + + + + + + + sn + o + wmobile + + + + + + + + + + + + + + + + + + + + + + + + ele + va + t + or + + + + + + + + + + + + + + + + + + ae + r + o + w + a + y_g + a + t + e + + + + + + + + + + + + + + + + + + + helipad + + + + + + + + + + + + + + + + + + + halt + + + + + + + + + + + + + + + + + + + + + + + + r + ail + w + a + y + + + + + + + + + + + + + + + + + + ru + n + w + a + y + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + f + o + r + d + + + + + + + + + + + + + + + mini_ + r + oundabout + + + + + + + + + + + + + + + + taxi + w + a + y + + + + + + t + r + ain_st + a + tion + + + + + + + + + + + + + + t + r + ain + + + + + + + + + + + + + animal_shel + t + er + + + + + + + c + ou + r + thouse + + + + + + + + + + + + + fi + r + e_st + a + tion + + + + + + + + + + + + + + + + + + + + + landma + r + k + + + + + + + + + + + poli + c + e + + + + + + + + de + n + tist + + + + + + clinic + + + + + + + + + + + + hospital + + + + + + + v + e + t + e + r + ina + r + y + + + + + + + + + + + + + + + + + + + + + + v + e + t + e + r + ina + r + y_dog + + + + + + + + muslim + + + + + + + + jewish + + + + + + + desse + r + t + + + + + + + lib + r + a + r + y + + + + + + + + ge + y + ser + + + + + + + + + + + + + + + + + + + + + + + + + + hu + n + ting + + + + + + + + + + + + + + + + + beach_ + c + oarse + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + o + r + cha + r + d + + + + + + + + + + + + + + + + + pla + n + t_nurse + r + y + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ru + r + al + + + + + mine + + + + + + + + + + + + + + + + + t + r + e + e + -s + + + + + + + t + r + ee + + + + + + + + + + le + v + el_c + r + ossing2 + + + + + + + + + + + + + le + v + el_c + r + ossing + + + + + + + sli + p + w + a + y + + + + + + + + + + + RELIGOUS + + TRANSIT + + CAR & BIKE + + AMENITIES III + + N + A + TURA + L + + CIVIC + + HEA + L + TH + + EDUC + A + TION + + AMENITIES I + + AMENITIES II + + PERSONA + L + CARE + + SHOPPING I + + SHOPPING II + + SHOPPING III + + SHOPPING III + + PETS + + + + + + + + + + + + + + + + + + + + + + + + SPORTS I + + SPORTS II + + FOOD SHOPPING + + DRINKING + + E + A + TING I + + E + A + TING II + + SNACKING + + ARTS + + GENERIC + + OUTDOOR + + C + A + TEGORIES + + + + 0.7 + + 0.1 + + 0.1 + + 0.1 + + 0.1 + + 0.1 + + 0.1 + + 0.1 + + 0.1 + + 0.2 + + 0.2 + + 0.6 + + 0.2 + + 0.2 + + 0.2 + + 0.2 + + 0.2 + + 0.2 + + 0.2 + + 0.2 + + 0.2 + + 0.2 + + 0.2 + + 0.2 + + 0.2 + + 0.2 + + 0.2 + + 0.7 + + 0.2 + + 0.2 + + 0.2 + + 0.2 + + 0.1 + + 0.1 + + 0.1 + + 0.8 + + 0.8 + + 0.8 + + 1.0 + + + ??? + + ??? + + ??? + + ??? + + ??? + + ??? + + ??? + + ??? + + ??? + + 0.11 + + ??? + + ??? + + ????????? + + ??? + + ??? + + ??? + + ??? + + ??? + + ??? + + ??? + + ??? + + ??? + + ??????? + + ??? + + ??????? + + ??? + + ??? + + ??? + + ??? + + ??? + + ??? + + ??? + + ??? + + ??? + + ??? + + ??? + + ??? + + ??? + + ??????????? + + ???xxxxx + + ??? + + surf spot only + + ?????????? + + ???????? + + ??? + + ??? + + ??? + + ??? + + ??? + + ??? + + ??? + + building=stable + + ??? + + ??? + + ??? + + ??? + + ??? + + ??? + + ??? + + 0.9 + + 0.10 + + 0.10 trailhead + + ??? + + \ No newline at end of file diff --git a/sprites/src/main.rs b/sprites/src/main.rs index 528a3526..0a29b15d 100644 --- a/sprites/src/main.rs +++ b/sprites/src/main.rs @@ -226,13 +226,13 @@ fn extract_groups_from_svg( if shader.icons.contains_key(&substr) { let black = parse_color( - shader.themes[&shader.icons[&substr]][0] + shader.flavors[&shader.icons[&substr]][0] .strip_prefix("#") .unwrap(), ) .unwrap(); let white = parse_color( - shader.themes[&shader.icons[&substr]][1] + shader.flavors[&shader.icons[&substr]][1] .strip_prefix("#") .unwrap(), ) @@ -284,7 +284,7 @@ fn extract_groups_from_svg( #[derive(Debug, Serialize, Deserialize)] struct Shader { - themes: HashMap>, + flavors: HashMap>, icons: HashMap, } diff --git a/sprites/themes/black.json b/sprites/themes/black.json deleted file mode 100644 index 8842be10..00000000 --- a/sprites/themes/black.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "themes": { - "base":["#aaaaaa","#000000"] - }, - "icons": { - "townspot":"base", - "capital":"base" - } -} \ No newline at end of file diff --git a/sprites/themes/grayscale.json b/sprites/themes/grayscale.json deleted file mode 100644 index 5a4692a0..00000000 --- a/sprites/themes/grayscale.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "themes": { - "base":["#444444","#dddddd"] - }, - "icons": { - "townspot":"base", - "capital":"base" - } -} \ No newline at end of file diff --git a/sprites/themes/white.json b/sprites/themes/white.json deleted file mode 100644 index 140e08b9..00000000 --- a/sprites/themes/white.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "themes": { - "base":["#888888","#ffffff"] - }, - "icons": { - "townspot":"base", - "capital":"base" - } -} \ No newline at end of file diff --git a/styles/src/base_layers.ts b/styles/src/base_layers.ts index 0d265dd0..51afa117 100644 --- a/styles/src/base_layers.ts +++ b/styles/src/base_layers.ts @@ -1429,6 +1429,20 @@ export function labels_layers( "text-halo-width": 1, }, }, + { + id: "roads_oneway", + type: "symbol", + source: source, + "source-layer": "roads", + minzoom: 16, + filter: ["==", ["get", "oneway"], "yes"], + layout: { + "symbol-placement": "line", + "icon-image": "arrow", + "icon-rotate": 90, + "symbol-spacing": 100, + }, + }, { id: "roads_labels_minor", type: "symbol",