[editor] Add more complex types and support healthcare and education

Signed-off-by: map-per <map-per@gmx.de>

SECURITY.md

@@ -1,17 +0,0 @@
-## Reporting Vulnerabilities
-You can report a security vulnerability by creating an issue or send mail to legal@comaps.app
-
-## Verifying Fingerprints
-
-To [verify](https://developer.android.com/studio/command-line/apksigner#usage-verify) the APK, use the following signing certificate fingerprints:
-```
-SHA-256: 4894e8e6963627ef660031d8593fe77297f835acb4e23810003e926135023b4c
-SHA-1: 8b7b5739f917e9f7c681671ced0c9c8562123ade
-MD5: 9cce0ffea281dc2f0e0a154d6d2e281e
-```
-
-To verify CoMaps via [AppVerifier](https://github.com/soupslurpr/AppVerifier), use the following signing certificate fingerprint:
-```
-app.comaps
-48:94:E8:E6:96:36:27:EF:66:00:31:D8:59:3F:E7:72:97:F8:35:AC:B4:E2:38:10:00:3E:92:61:35:02:3B:4C
-```

android/sdk/src/main/res/values/types_strings.xml

@@ -179,7 +179,7 @@
     <!-- Compared to wilderness_hut its smaller and simpler, without a fireplace. -->
     <string name="type.amenity.shelter.basic_hut">Bivouac Hut</string>
     <!-- A traditional 3-walled shelter (one side open), suitable for overnight camping. -->
-    <string name="type.amenity.shelter.lean_to">Lean-to Shelter</string>
+    <string name="type.amenity.shelter.lean_to">Lean-to Sleep Shelter</string>
     <string name="type.amenity.public_bath">Public Bath</string>
     <string name="type.amenity.shower">Shower</string>
     <string name="type.amenity.stripclub">Stripclub</string>
@@ -198,7 +198,7 @@
     <string name="type.amenity.vending_machine.food">Food Dispenser</string>
     <string name="type.amenity.vending_machine.newspapers">Newspaper Dispenser</string>
     <string name="type.amenity.vending_machine.parking_tickets">Parking Meter</string>
-    <string name="type.amenity.vending_machine.public_transport_tickets">Ticket Machine</string>
+    <string name="type.amenity.vending_machine.public_transport_tickets">Public Transport Ticket Machine</string>
     <string name="type.amenity.vending_machine.sweets">Sweets Dispenser</string>
     <string name="type.amenity.vending_machine.excrement_bags">Excrement Bags Dispenser</string>
     <string name="type.amenity.parcel_locker">Parcel Locker</string>

data/categories-strings/en.json/localize.json

@@ -81,6 +81,9 @@
 "amenity-townhall": "3Town Hall|townhall|city hall|guildhall|village hall|4municipal hall|civic centre",
 "tourism-attraction|@category_tourism": "4Attraction|U+1F3A0|U+1F3A1|U+1F3A2|U+1F3AA",
 "tourism-artwork": "3Artwork|U+1F3A8",
+"tourism-artwork-sculpture": "Sculpture|Artwork|U+1F3A8",
+"tourism-artwork-statue": "Statue|Artwork|U+1F3A8",
+"tourism-artwork-painting": "Painting|Artwork|U+1F3A8",
 "tourism-viewpoint|@category_tourism": "4Viewpoint|Vista",
 "tourism-information": "4Tourist Information|4information|U+1F481",
 "tourism-picnic_site|amenity-bbq|leisure-picnic_table": "3Picnic Site|picnic|Barbecue Grill|Picnic Table|bbq|Barbec",
@@ -197,7 +200,7 @@
 "amenity-school": "3School|U+1F392|U+1F3EB",
 "amenity-shelter": "4Shelter|refuge",
 "amenity-shelter-basic_hut": "basic hut|3Bivouac Hut|Bivvy|Bothy|Hut",
-"amenity-shelter-lean_to": "3Lean-to Shelter|4Shelter|Refuge|lean shelter|shelter",
+"amenity-shelter-lean_to": "3Lean-to Sleep Shelter|4Shelter|Refuge|lean shelter|Lean-to Shelter",
 "amenity-stripclub": "Stripclub|strip club",
 "amenity-telephone": "2Phone|U+260E|U+1F4DE|5Telephone",
 "@category_toilet": "3Toilet|toilets|4Restroom|potty|WC|water closet",
@@ -365,20 +368,21 @@
 "shop-pet|@shop": "3Pet",
 "tourism-zoo|@category_tourism|@category_children": "2Zoo",
 "attraction-animal": "Animal Enclosure",
-"tourism-information-office|amenity-ranger_station|@category_tourism": "4Tourism office|6Ranger station",
+"tourism-information-office|amenity-ranger_station|@category_tourism": "4Tourist Office|Tourism office|6Ranger station|Information",
-"tourism-information-visitor_centre|amenity-ranger_station|@category_tourism": "3Visitor centre|6Ranger station",
+"tourism-information-visitor_centre|amenity-ranger_station|@category_tourism": "3Visitor centre|6Ranger station|Information",
 "amenity-community_centre": "4Community centre",
 "amenity-compressed_air": "6Compressed air",
 "amenity-courthouse": "4Courthouse",
-"amenity-vending_machine-cigarettes": "4Cigarette dispenser",
+"amenity-vending_machine": "Vending Machine",
-"amenity-vending_machine-coffee": "4Coffee dispenser|Coffee",
+"amenity-vending_machine-cigarettes": "4Cigarette dispenser|Vending Machine",
-"amenity-vending_machine-condoms": "4Condoms dispenser|Condoms|Condomat",
+"amenity-vending_machine-coffee": "4Coffee dispenser|Coffee|Vending Machine",
-"amenity-vending_machine-drinks": "4Drinks dispenser|4Beverages",
+"amenity-vending_machine-condoms": "4Condoms dispenser|Condoms|Condomat|Vending Machine",
-"amenity-vending_machine-food|@category_food": "4Food dispenser|Food|Snacks",
+"amenity-vending_machine-drinks": "4Drinks dispenser|4Beverages|Vending Machine",
+"amenity-vending_machine-food|@category_food": "4Food dispenser|Food|Snacks|Vending Machine",
 "amenity-vending_machine-parking_tickets|@category_parking": "4Parking tickets|3Pay and Display|Parkomat|Parking Meter",
-"amenity-vending_machine-public_transport_tickets|@category_transport": "6Ticket machine|Transport Tickets|Tickets|4Fare machine|Bus tickets|Train tickets|Ticketing",
+"amenity-vending_machine-public_transport_tickets|@category_transport": "4Public Transport Ticket Machine|6Ticket machine|Transport Tickets|Tickets|4Fare machine|Bus tickets|Train tickets|Ticketing|Vending Machine",
 "amenity-vending_machine-newspapers": "4Newspaper Dispenser|Newspapers",
-"amenity-vending_machine-sweets": "4Sweets Dispenser|Sweets|4Candies|Lollies",
+"amenity-vending_machine-sweets": "4Sweets Dispenser|Sweets|4Candies|Lollies|Vending Machine",
 "amenity-vending_machine-excrement_bags": "5Excrement Bags Dispenser|4Poop Bags|3Dog Poop Bags|Animal Waste",
 "amenity-parcel_locker|@category_post": "4Parcel Locker|4Parcel Pickup",
 "shop-outpost": "4Pickup Point|4Parcel Pickup",
@@ -398,6 +402,7 @@
 "tourism-chalet|@category_hotel": "5Holiday Cottage|5vacation home|4Chalet",
 "tourism-information-board": "Information Board",
 "tourism-information-map": "Tourist map|map|4Information",
+"tourism-information-guidepost": "Guidepost",
 "aerialway-station": "Aerialway Station|5Cable car station",
 "aeroway-helipad": "4Helipad",
 "barrier-border_control": "4Border Control",
@@ -499,6 +504,7 @@
 "leisure-track": "Track",
 "leisure-bandstand": "5Bandstand",
 "power-plant": "Power Plant",
+"power-generator-wind": "Wind Generator",
 "shop-auction|@category_secondhand": "4Auction|Auctioneer|Auction House",
 "shop-collector|@category_shopping|@category_secondhand": "Collectables|Collector",
 "man_made-cairn": "4Cairn",

data/editor.config

@@ -511,6 +511,16 @@
       <type id="amenity-animal_shelter">
         <include group="poi_internet" />
       </type>
+      <type id="amenity-charging_station-motorcar-small">
+        <include group="charge_sockets" />
+        <include field="opening_hours" />
+        <include field="operator" />
+      </type>
+      <type id="amenity-charging_station-bicycle">
+        <include group="charge_sockets" />
+        <include field="opening_hours" />
+        <include field="operator" />
+      </type>
       <type id="amenity-charging_station">
         <include group="charge_sockets" />
         <include field="opening_hours" />
@@ -740,8 +750,7 @@
         <include field="height" />
         <!-- <include field="wikipedia" /> -->
       </type>
-      <!-- Too generic to be added -->
+      <type id="office" group="office">
-      <type id="office" can_add="no">
         <include group="poi_internet" />
       </type>
       <type id="office-company" group="office">
@@ -838,6 +847,12 @@
       <type id="shop-bathroom_furnishing" group="shop">
         <include group="poi_internet" />
       </type>
+      <type id="shop-beauty-nails">
+        <include group="poi_internet" />
+      </type>
+      <type id="shop-beauty-day_spa">
+        <include group="poi_internet" />
+      </type>
       <type id="shop-beauty">
         <include group="poi_internet" />
       </type>
@@ -1108,6 +1123,15 @@
       <type id="tourism-aquarium">
         <include group="poi_internet" />
       </type>
+      <type id="tourism-artwork-sculpture">
+        <include field="name" />
+      </type>
+      <type id="tourism-artwork-statue">
+        <include field="name" />
+      </type>
+      <type id="tourism-artwork-painting">
+        <include field="name" />
+      </type>
       <type id="tourism-artwork">
         <include field="name" />
       </type>
@@ -1178,6 +1202,12 @@
       <type id="amenity-compressed_air" />
       <type id="amenity-bbq" />
       <type id="leisure-slipway" />
+      <type id="amenity-shelter-basic_hut">
+        <include field="name" />
+      </type>
+      <type id="amenity-shelter-lean_to">
+        <include field="name" />
+      </type>
       <type id="amenity-shelter">
         <include field="name" />
       </type>
@@ -1375,6 +1405,9 @@
       <type id="leisure-indoor_play">
         <include group="poi_internet" />
       </type>
+      <type id="leisure-fitness_centre-sport-yoga">
+        <include group="poi_internet" />
+      </type>
       <type id="leisure-fitness_centre">
         <include group="poi_internet" />
       </type>
@@ -1426,10 +1459,14 @@
       <type id="man_made-lighthouse">
         <include field="name" />
       </type>
+      <type id="man_made-mast-communication" />
       <type id="man_made-mast" />
       <type id="man_made-survey_point">
         <include field="name" />
       </type>
+      <type id="power-generator-wind">
+        <include field="operator" />
+      </type>
       <type id="man_made-windmill">
         <include field="name" />
       </type>
@@ -1557,9 +1594,6 @@
       <type id="building-address" can_add="yes">
         <include group="address" />
       </type>
-      <!-- Uncomment this after a map style is added
-      <type id="man_made-surveillance">
-      </type-->
       <type id="tourism-theme_park">
         <include group="poi_internet" />
       </type>

data/mapcss-mapping.csv

@@ -101,7 +101,7 @@ natural|wetland;33;
 deprecated:highway|track|grade3:04.4024;[highway=track][tracktype=grade3];x;name;int_name;34;highway|track
 # ~1M usages.
 power|minor_line;[power=minor_line][!location];;;;35;
-amenity|school;[amenity=school],[education=school];;name;int_name;36;
+amenity|school;[amenity=school][education=school],[amenity=school],[education=school];;name;int_name;36;
 # Dedicated/segregated cycleways (e.g. segregated paths are converted into cycleways + footways, see osm2type.cpp).
 highway|cycleway;37;
 # ~16M usages.
@@ -202,7 +202,7 @@ landuse|commercial;111;
 moved:railway|station:05.2024;112;railway|station
 deprecated:highway|path|hiking:04.2024;[highway=path][route=hiking],[highway=path][sac_scale=hiking];x;name;int_name;113;highway|path
 # ~200k usages.
-amenity|hospital;114;
+amenity|hospital;[amenity=hospital][healthcare=hospital],[amenity=hospital],[healthcare=hospital];;name;int_name;114;
 # TODO: merge with "intermittent".
 waterway|stream|ephemeral;[waterway=stream][intermittent=ephemeral];;name;int_name;115;
 highway|trunk|bridge;[highway=trunk][bridge?];;name;int_name;116;
@@ -210,7 +210,7 @@ highway|trunk|bridge;[highway=trunk][bridge?];;name;int_name;116;
 amenity|post_office;117;
 # ~230k usages.
 landuse|quarry;118;
-amenity|pharmacy;119;
+amenity|pharmacy;[amenity=pharmacy][healthcare=pharmacy],[amenity=pharmacy],[healthcare=pharmacy];;name;int_name;119;
 man_made|pier;120;
 # ~220k usages.
 highway|motorway_junction;121;
@@ -276,7 +276,7 @@ deprecated:natural|wood|coniferous:01.2020;[natural=wood][wood=coniferous],[natu
 landuse|recreation_ground;173;
 landuse|village_green;174;
 amenity|drinking_water;175;
-amenity|university;[amenity=university],[education=university];;name;int_name;176;
+amenity|university;[amenity=university][education=university],[amenity=university],[education=university];;name;int_name;176;
 highway|secondary_link;177;
 power|substation;178;
 railway|tram_stop;179;
@@ -309,7 +309,7 @@ power|portal;204;
 # Marsh 500K usages, wet_meadow 160K
 natural|wetland|marsh;[natural=wetland][wetland=marsh],[natural=wetland][wetland=wet_meadow],[natural=wetland][wetland=dambo];;;;205;
 leisure|stadium;206;
-amenity|doctors;207;
+amenity|doctors;[amenity=doctors][healthcare=doctor],[amenity=doctors],[healthcare=doctor];;name;int_name;207;
 railway|disused;208;
 aeroway|runway;209;
 railway|halt;210;
@@ -327,7 +327,7 @@ sport|swimming;220;
 leisure|track;221;
 sport|skateboard;222;
 barrier|retaining_wall;223;
-amenity|college;[amenity=college],[education=college];;name;int_name;224;
+amenity|college;[amenity=college][education=college],[amenity=college],[education=college];;name;int_name;224;
 sport|baseball;225;
 highway|service|area;[highway=service][area?];;name;int_name;226;
 highway|residential|area;[highway=residential][area?];;name;int_name;227;
@@ -625,9 +625,9 @@ toilets|yes;502;
 highway|trunk_link|tunnel;[highway=trunk_link][tunnel?];;name;int_name;503;
 drinking_water|yes;[drinking_water=yes],[drinking_water=treated],[drinking_water:refill=yes];;;;504;
 drinking_water|no;505;
-amenity|sailing_school;[amenity=sailing_school],[education=sailing_school];;name;int_name;506;
+amenity|sailing_school;[amenity=sailing_school][education=sailing_school],[amenity=sailing_school],[education=sailing_school];;name;int_name;506;
-amenity|flight_school;[amenity=flight_school],[education=flight_school];;name;int_name;507;
+amenity|flight_school;[amenity=flight_school][education=flight_school],[amenity=flight_school],[education=flight_school];;name;int_name;507;
-amenity|prep_school;[amenity=prep_school],[education=prep_school];;name;int_name;508;
+amenity|prep_school;[amenity=prep_school][education=prep_school],[amenity=prep_school],[education=prep_school];;name;int_name;508;
 amenity|car_pooling;509;
 social_facility|soup_kitchen;510;
 social_facility|food_bank;511;
@@ -1160,8 +1160,8 @@ railway|subway_entrance|madrid;[railway=subway_entrance][city=madrid];;name;int_
 railway|subway_entrance|roma;[railway=subway_entrance][city=roma];;name;int_name;1033;
 railway|subway_entrance|spb;[railway=subway_entrance][city=spb];;name;int_name;1034;
 aerialway|drag_lift;1035;
-amenity|dentist;1036;
+amenity|dentist;[amenity=dentist][healthcare=dentist],[amenity=dentist],[healthcare=dentist];;name;int_name;1036;
-amenity|clinic;1037;
+amenity|clinic;[amenity=clinic][healthcare=clinic],[amenity=clinic],[healthcare=clinic];;name;int_name;1037;
 barrier|entrance;1038;
 barrier|border_control;1039;
 shop|laundry;1040;
@@ -1257,8 +1257,8 @@ amenity|vending_machine|food;[amenity=vending_machine][vending=food];;name;int_n
 amenity|vending_machine|newspapers;[amenity=vending_machine][vending=newspapers];;name;int_name;1130;
 amenity|vending_machine|sweets;[amenity=vending_machine][vending=sweets];;name;int_name;1131;
 leisure|dance;[leisure=dance],[amenity=dancing_school];;;;1132;
-amenity|music_school;[amenity=music_school],[education=music_school];;name;int_name;1133;
+amenity|music_school;[amenity=music_school][education=music_school],[amenity=music_school],[education=music_school];;name;int_name;1133;
-amenity|language_school;[amenity=language_school],[education=language_school];;name;int_name;1134;
+amenity|language_school;[amenity=language_school][education=language_school],[amenity=language_school],[education=language_school];;name;int_name;1134;
 historic|city_gate;1135;
 sport|padel;1136;
 sport|futsal;1137;
@@ -1285,7 +1285,7 @@ shop|charity;1157;
 hwtag|toll;1158;
 amenity|arts_centre;1159;
 amenity|biergarten;1160;
-amenity|driving_school;[amenity=driving_school],[education=driving_school];;name;int_name;1161;
+amenity|driving_school;[amenity=driving_school][education=driving_school],[amenity=driving_school],[education=driving_school];;name;int_name;1161;
 amenity|food_court;1162;
 amenity|ice_cream;1163;
 amenity|internet_cafe;1164;

iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings

@@ -189,7 +189,7 @@
 "type.amenity.shelter.basic_hut" = "Bivouac Hut";
 
 /* A traditional 3-walled shelter (one side open), suitable for overnight camping. */
-"type.amenity.shelter.lean_to" = "Lean-to Shelter";
+"type.amenity.shelter.lean_to" = "Lean-to Sleep Shelter";
 "type.amenity.public_bath" = "Public Bath";
 "type.amenity.shower" = "Shower";
 "type.amenity.stripclub" = "Stripclub";
@@ -208,7 +208,7 @@
 "type.amenity.vending_machine.food" = "Food Dispenser";
 "type.amenity.vending_machine.newspapers" = "Newspaper Dispenser";
 "type.amenity.vending_machine.parking_tickets" = "Parking Meter";
-"type.amenity.vending_machine.public_transport_tickets" = "Ticket Machine";
+"type.amenity.vending_machine.public_transport_tickets" = "Public Transport Ticket Machine";
 "type.amenity.vending_machine.sweets" = "Sweets Dispenser";
 "type.amenity.vending_machine.excrement_bags" = "Excrement Bags Dispenser";
 "type.amenity.parcel_locker" = "Parcel Locker";