From 1e5a6d40c0564710ed8effd1b6ab80924005e97d Mon Sep 17 00:00:00 2001 From: Sergey Vartanov Date: Wed, 15 Dec 2021 10:45:08 +0300 Subject: [PATCH] Add icon names; add collections. --- data/collections.json | 9 +++++++ doc/grid.svg | 2 +- map_machine/icons/config.json | 46 ++++++++++++++++++----------------- map_machine/icons/icons.svg | 20 +++++---------- 4 files changed, 40 insertions(+), 37 deletions(-) diff --git a/data/collections.json b/data/collections.json index 134a35f..ec07c16 100644 --- a/data/collections.json +++ b/data/collections.json @@ -1,4 +1,13 @@ [ + { + "page": "Tag:artwork_type=statue", + "id": "statue", + "tags": {"tourism": "artwork", "artwork_type": "statue"}, + "row_tags": [ + {}, + {"amenity": "bench"} + ] + }, { "page": "Key:tank_trap", "id": "tank_trap", diff --git a/doc/grid.svg b/doc/grid.svg index 0e7708e..a56cc68 100644 --- a/doc/grid.svg +++ b/doc/grid.svg @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/map_machine/icons/config.json b/map_machine/icons/config.json index 56ebdea..0d2a395 100644 --- a/map_machine/icons/config.json +++ b/map_machine/icons/config.json @@ -1,8 +1,8 @@ { "architecture": { "building_size": { - "apartments": {}, - "building": {}, + "apartments": {"name": "apartments building"}, + "building": {"name": "house"}, "fort": {"name": "fort"}, "mausoleum": {"name": "mausoleum"}, "minaret": {"name": "minaret"}, @@ -69,6 +69,7 @@ "glider": {"name": "glider"}, "light_left": {"is_part": true, "name": "leftward light"}, "light_right": {"is_part": true, "name": "rightward light"}, + "sharing": {"name": "clockwise arrows"}, "rectangle_vertical_rounded": {"name": "vertical rounded rectangle"}, "rectangle_vertical_rounded_crossed": {"name": "crossed vertical rounded rectangle"}, "triangle_small": {"emoji": "⛰️", "name": "small triangle"}, @@ -117,14 +118,14 @@ "y": {"name": "letter Y", "categories": ["letter"]} }, "religious": { - "baptist": {}, + "baptist": {"name": "baptist symbol"}, "crescent": {"emoji": "☪️", "name": "crescent"}, "latin_cross": {"emoji": "✝️", "name": "Latin cross"}, "cross_and_horizontal_bar": {"name": "cross and horizontal bar️"}, "dharmachakra": {"name": "dharmachakra"}, "greek_cross": {"name": "greek cross"}, "greek_cross_in_box": {"name": "inverted Greek cross in box"}, - "orthodox": {"emoji": "☦️"}, + "orthodox": {"emoji": "☦️", "name": "orthodox cross"}, "russian_orthodox_cross": {"name": "Russian Orthodox cross", "emoji": "☦"}, "star_of_david": {"emoji": "✡️", "name": "Star of David"} } @@ -153,8 +154,8 @@ "stop": {"emoji": [ "🛑", "⛔️" ], "categories": ["highway"], "name": "stop sign"}, "traffic_signals": {"emoji": "🚦", "name": "traffic signals"} }, - "bus_stop_bench": {"is_part": true}, - "bus_stop_shelter": {"is_part": true}, + "bus_stop_bench": {"is_part": true, "name": "bus stop bench"}, + "bus_stop_shelter": {"is_part": true, "name": "bus stop shelter"}, "charging_station": {"name": "charging station"} }, "sea": { @@ -196,7 +197,7 @@ "amphora": {"name": "amphora"}, "bbq": {"name": "BBQ"}, "beer_mug": {"emoji": "🍺", "name": "beer mug"}, - "bottle": {}, + "bottle": {"name": "bottle"}, "bottle_and_wine_glass": {"name": "wine bottle and wine glass"}, "cocktail_glass": {"name": "cocktail glass", "emoji": "🍸"}, "cocktail_glass_with_straw": {"name": "cocktail glass with straw", "emoji": "🍸"}, @@ -268,14 +269,14 @@ "books": {"emoji": "📚", "name": "books"} }, "other": { - "amusement_ride": {"emoji": "🎠"}, + "amusement_ride": {"emoji": "🎠", "name": "amusement ride"}, "atm": {"name": "bill acceptor"}, - "awning": {"is_part": true}, + "awning": {"is_part": true, "name": "awning"}, "beach": {"name": "umbrella and water"}, "binoculars": {"name": "binocular"}, "binoculars_on_pole": {"name": "binoculars on pole"}, "bleachers": {"name": "bleachers"}, - "bottom_right_horizontal_line": {"is_part": true}, + "bottom_right_horizontal_line": {"is_part": true, "name": "bottom right horizontal line"}, "briefcase": {"name": "briefcase"}, "buffer_stop": {"name": "buffer stop"}, "camp": {"name": "camp"}, @@ -290,7 +291,7 @@ "diamond": {"emoji": "💎", "name": "diamond"}, "digital_clock": {"name": "digital clock"}, "door_with_keyhole": {"name": "door with keyhole"}, - "drinking_water": {"emoji": "🚰"}, + "drinking_water": {"emoji": "🚰", "name": "tap and glass"}, "dumbbell": {"name": "dumbbell"}, "entrance": {"name": "door"}, "envelope": {"emoji": "✉️", "name": "envelope"}, @@ -321,18 +322,19 @@ "key": {"is_part": true, "name": "key"}, "kiosk": {"name": "kiosk"}, "life_ring": {"categories": ["emergency"], "emoji": "🛟", "name": "life ring"}, - "lift_gate": {}, + "lift_gate": {"name": "lift gate"}, "lock": {"emoji": "🔒", "name": "closed lock"}, "lock_unlocked": {"name": "opened lock"}, "lock_with_keyhole": {"emoji": "🔒", "name": "closed lock with keyhole"}, "lowered_kerb": {"name": "lowered kerb"}, "main_entrance": {"name": "main entrance"}, "manhole_drain": {"name": "drain manhole cover"}, + "marketplace": {"name": "marketplace"}, "medicine_bottle": {"name": "medicine bottle"}, "microphone": {"emoji": "🎤", "name": "microphone"}, "milestone": {"name": "milestone"}, "money": {"name": "banknotes"}, - "no_door": {}, + "no_door": {"name": "doorway"}, "no_foot": {"name": "crossed out footprint"}, "no_wheelchair": {"name": "wheelchair with X sign"}, "onion_roof_shape": {"name": "onion roof shape"}, @@ -340,7 +342,7 @@ "pergola": {"is_part": true, "name": "pergola"}, "picture": {"name": "picture in frame"}, "pipeline": {"name": "pipeline with valve"}, - "platform": {"is_part": true}, + "platform": {"is_part": true, "name": "platform"}, "pole": {"name": "pole"}, "power_generator": {"name": "power generator"}, "prison": {"name": "bars"}, @@ -351,19 +353,19 @@ "shelter": {"name": "shelter"}, "shop_convenience": {"name": "convenience store"}, "shower": {"name": "shower"}, - "signal": {}, + "signal": {"name": "railway signal"}, "solar_panel": {"name": "solar panel"}, "sos_phone": {"name": "phone with SOS", "categories": ["emergency"]}, "stained_glass": {"name": "stained glass"}, "staircase": {"name": "door with stairs"}, "statue_exhibit": {"name": "indoor statue"}, "supermarket_cart": {"name": "supermarket cart"}, - "support_column": {"is_part": true}, - "support_pole": {"is_part": true}, - "support_wall": {"is_part": true}, - "survey_point": {}, + "support_column": {"is_part": true, "name": "support column"}, + "support_pole": {"is_part": true, "name": "support pole"}, + "support_wall": {"is_part": true, "name": "support wall"}, + "survey_point": {"name": "survey point"}, "suspension_railway": {"name": "suspension railway", "emoji": "🚟"}, - "swimming_area": {}, + "swimming_area": {"name": "pool ladder"}, "tactile_paving": {"name": "tactile paving"}, "ticket": {"emoji": [ "🎫", "🎟" ], "name": "ticket"}, "toll_booth": {"name": "toll booth"}, @@ -492,7 +494,7 @@ "car_on_ferry": {"name": "car over water"}, "caravan": {"name": "caravan"}, "maglev": {"name": "maglev", "categories": ["public transport"]}, - "monorail": {"categories": ["public transport"]}, + "monorail": {"categories": ["public transport"], "name": "monorail"}, "plane": {"emoji": "✈️", "name": "plane", "categories": ["aeroway", "public transport"]}, "taxi": {"categories": ["public transport"], "name": "taxi sign"}, "train": {"emoji": "🚆", "name": "train", "categories": ["public transport"]}, @@ -508,7 +510,7 @@ "vending_excrement_bag": {"name": "excrement bag vending"}, "vending_machine": {"name": "vending machine"}, "vending_p": {"name": "vending machine with letter P"}, - "vending_tickets": {} + "vending_tickets": {"name": "ticket vending machine"} }, "historic": { "memorial": {"categories": ["historic"], "name": "memorial"}, diff --git a/map_machine/icons/icons.svg b/map_machine/icons/icons.svg index 0eedb61..e6faedb 100644 --- a/map_machine/icons/icons.svg +++ b/map_machine/icons/icons.svg @@ -140,20 +140,20 @@ inkscape:snap-intersection-paths="true" inkscape:object-nodes="true" inkscape:window-maximized="0" - inkscape:window-y="25" + inkscape:window-y="0" inkscape:window-x="0" - inkscape:window-height="847" + inkscape:window-height="900" inkscape:window-width="1440" inkscape:snap-bbox="true" inkscape:object-paths="true" inkscape:guide-bbox="true" showguides="false" - showgrid="true" + showgrid="false" inkscape:document-units="px" inkscape:current-layer="layer1" - inkscape:cy="246.16155" - inkscape:cx="209.392" - inkscape:zoom="11.313709" + inkscape:cy="161.75" + inkscape:cx="175" + inkscape:zoom="2" inkscape:pageshadow="2" inkscape:pageopacity="0.0" borderopacity="1.0" @@ -619,10 +619,6 @@ style="opacity:0.2;fill:none;stroke:#000000;stroke-linecap:round;stroke-linejoin:round" d="m 365.5,514.5 v 2 0" id="path34779" /> - -