From 7e109646d0bb09d1c5802c8a3bd910adfb67308f Mon Sep 17 00:00:00 2001 From: Viktor Govako Date: Tue, 7 Jun 2022 12:48:26 +0300 Subject: [PATCH 1/8] [classifier] Added cemetery=grave. Signed-off-by: Viktor Govako --- data/mapcss-mapping.csv | 2 +- data/strings/types_strings.txt | 37 +++++++++++++++++++ .../styles/clear/include/Basemap_label.mapcss | 14 +++---- data/styles/clear/include/Icons.mapcss | 2 +- data/styles/vehicle/include/Icons.mapcss | 2 +- 5 files changed, 45 insertions(+), 12 deletions(-) diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv index 5158fd89f8..535510446e 100644 --- a/data/mapcss-mapping.csv +++ b/data/mapcss-mapping.csv @@ -465,7 +465,7 @@ deprecated|deprecated;464;x deprecated|deprecated;465;x piste:type|downhill|expert;[piste:type=downhill][piste:difficulty=expert];;name;int_name;466; landuse|salt_pond;467; -deprecated|deprecated;468;x +cemetery|grave;468; railway|monorail|bridge;[railway=monorail][bridge?];;name;int_name;469; area:highway|steps;470; deprecated|deprecated;471;x diff --git a/data/strings/types_strings.txt b/data/strings/types_strings.txt index 804c99fc46..5c4a2a701b 100644 --- a/data/strings/types_strings.txt +++ b/data/strings/types_strings.txt @@ -4762,6 +4762,43 @@ uk = Склад zh-Hans = 仓库 + [type.cemetery.grave] + en = Grave + ar = ﺮﻴﻄﺧ + be = Магіла + bg = Гроб + cs = Hrob + da = Grav + de = Grab + el = Τάφος + es = Tumba + eu = Hilobia + fa = ﺮﺒﻗ + fi = Hauta + fr = La tombe + he = רבק + hu = Sír + id = Kuburan + it = La tomba + ja = 墓 + ko = 무덤 + nb = Grav + nl = Graf + pl = Mogiła + pt = Túmulo + pt-BR = Túmulo + ro = Mormânt + ru = Могила + sk = Hrob + sv = Grav + sw = Kaburi + th = หลุมฝังศพ + tr = Mezar + uk = Могила + vi = Phần mộ + zh-Hans = 墓穴 + zh-Hant = 墓穴 + [type.craft] en = Craft fr = Artisanat diff --git a/data/styles/clear/include/Basemap_label.mapcss b/data/styles/clear/include/Basemap_label.mapcss index 72a6273726..53870e98f9 100644 --- a/data/styles/clear/include/Basemap_label.mapcss +++ b/data/styles/clear/include/Basemap_label.mapcss @@ -47,6 +47,8 @@ area[landuse=cemetery], node[landuse=cemetery], area[amenity=grave_yard], node[amenity=grave_yard], +node[cemetery=grave], +area[cemetery=grave], {z-index: 800;} line[isoline], @@ -626,18 +628,12 @@ node|z15-[landuse=quarry], /* 7.4 Cemetry */ area|z15-[landuse=cemetery], -node|z15-[landuse=cemetery], -area|z17-[amenity=grave_yard], -node|z17-[amenity=grave_yard], -{text: name;text-offset: 1;font-size: 10;text-color: @poi_label;} - -area|z15-16[landuse=cemetery] -{icon-image: cemetery-m.svg;} -area|z17-[landuse=cemetery], node|z17-[landuse=cemetery], area|z17-[amenity=grave_yard], node|z17-[amenity=grave_yard], -{icon-image: cemetery-m.svg;} +node|z17-[cemetery=grave], +area|z17-[cemetery=grave], +{icon-image: cemetery-m.svg; text: name; text-offset: 1; font-size: 10; text-color: @poi_label;} /* 7.5 Pedestrian areas */ diff --git a/data/styles/clear/include/Icons.mapcss b/data/styles/clear/include/Icons.mapcss index 1586a24f35..1085ce173d 100644 --- a/data/styles/clear/include/Icons.mapcss +++ b/data/styles/clear/include/Icons.mapcss @@ -988,7 +988,7 @@ area|z17-[historic=wayside_shrine], node|z17-[historic=archaeological_site], area|z17-[historic=archaeological_site], node|z17-[amenity=arts_centre], -area|z17-[amenity=arts_centre] +area|z17-[amenity=arts_centre], {text: name;text-offset: 1;font-size: 10;text-color: @poi_label;text-optional: true;} node|z12-14[historic=fort], diff --git a/data/styles/vehicle/include/Icons.mapcss b/data/styles/vehicle/include/Icons.mapcss index afb06f7bbb..11167a013f 100644 --- a/data/styles/vehicle/include/Icons.mapcss +++ b/data/styles/vehicle/include/Icons.mapcss @@ -482,7 +482,7 @@ area|z15[historic=memorial] node|z16-[historic=monument], area|z16-[historic=monument], node|z16-[historic=memorial], -area|z16-[historic=memorial] +area|z16-[historic=memorial], {icon-image: monument-m.svg;icon-min-distance: 12;text: name;text-offset: 1;font-size: 10;text-color: @poi_label;} node|z15-[historic=memorial][memorial=plaque], -- 2.45.3 From b18248f2328812349d042152a3500b3bf56ca3ba Mon Sep 17 00:00:00 2001 From: Viktor Govako Date: Tue, 7 Jun 2022 13:15:19 +0300 Subject: [PATCH 2/8] [classifier] Replaced deprecated waterway-lock with natural-water-lock. Signed-off-by: Viktor Govako --- data/mapcss-mapping.csv | 4 +- data/strings/types_strings.txt | 47 ++++++++++++++++----- data/styles/clear/include/Basemap.mapcss | 4 -- data/styles/vehicle/include/Basemap.mapcss | 4 -- generator/generator_tests/osm_type_test.cpp | 2 +- 5 files changed, 40 insertions(+), 21 deletions(-) diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv index 535510446e..ef3aee3c24 100644 --- a/data/mapcss-mapping.csv +++ b/data/mapcss-mapping.csv @@ -495,8 +495,8 @@ deprecated|deprecated;494;x amenity|parking|park_and_ride;[amenity=parking][parking=park_and_ride];;name;int_name;495; deprecated|deprecated;496;x deprecated|deprecated;497;x -deprecated|deprecated;498;x -waterway|lock;499; +natural|water|lock;[natural=water][water=lock];;name;int_name;498; +waterway|lock;499;waterway|canal deprecated|deprecated;500;x deprecated|deprecated;501;x deprecated|deprecated;502;x diff --git a/data/strings/types_strings.txt b/data/strings/types_strings.txt index 5c4a2a701b..b8c8ef87ea 100644 --- a/data/strings/types_strings.txt +++ b/data/strings/types_strings.txt @@ -12638,6 +12638,43 @@ zh-Hans = 湖 zh-Hant = 湖泊 + [type.natural.water.lock] + en = Lock Chamber + ar = ﻞﻔﻘﻟﺍ ﺔﻓﺮﻏ + be = Шлюзавая камера + bg = Заключваща камера + cs = Zámková komora + da = Låsekammer + de = Schleusenkammer + el = Θάλαμος κλειδαριάς + es = Cámara de bloqueo + eu = Sarraila Ganbera + fa = ﻞﻔﻗ ﻕﺎﺗﺍ + fi = Lukko kammio + fr = Chambre de verrouillage + he = לוענמ את + hu = Zsilipkamra + id = Ruang Kunci + it = Camera di blocco + ja = ロックチャンバー + ko = 잠금 챔버 + nb = Låsekammer + nl = Slotkamer + pl = Komora zamka + pt = Câmara de Bloqueio + pt-BR = Câmara de Bloqueio + ro = Camera de blocare + ru = Шлюзовая камера + sk = Uzamykacia komora + sv = Låskammare + sw = Chumba cha kufuli + th = ห้องล็อค + tr = Kilit Odası + uk = Замкова камера + vi = Khoang khóa + zh-Hans = 锁室 + zh-Hant = 鎖室 + [type.natural.water.pond] en = Pond ar = بركة @@ -19705,16 +19742,6 @@ uk = Водовiдвiд zh-Hans = 渠 - [type.waterway.lock] - en = Waterway Lock - de = Schleuse - fr = Écluse - pt = Eclusa - pt-BR = Eclusa - ru = Шлюз - tr = Kanal Havuzu - uk = Шлюз - [type.waterway.lock_gate] en = Lock Gate ar = بوابة هويس diff --git a/data/styles/clear/include/Basemap.mapcss b/data/styles/clear/include/Basemap.mapcss index 3cc9b8ba6b..330fc3ecd5 100644 --- a/data/styles/clear/include/Basemap.mapcss +++ b/data/styles/clear/include/Basemap.mapcss @@ -127,7 +127,6 @@ line[waterway=riverbank], line[waterway=stream], line[waterway=canal], line[natural=strait], -line[waterway=lock], line[waterway=ditch], line[waterway=drain], {z-index: 50;} @@ -360,7 +359,6 @@ line|z13-[waterway=stream], line|z13-[waterway=stream][intermittent=yes], line|z13-[waterway=canal], line|z13-[natural=strait], -line|z16-[waterway=lock], {opacity: 1;color: @river;-x-me-line-priority: -15600;} /* 6.1 Area water(lake,pond etc.) */ @@ -418,8 +416,6 @@ line|z15-[natural=strait], line|z15-[waterway=stream][intermittent=yes] {width: 1.4;dashes: 4.95,4.95;} -line|z16-[waterway=lock], -{width: 1.5;} node|z16-[waterway=lock_gate], {icon-image: dot-m.svg;} diff --git a/data/styles/vehicle/include/Basemap.mapcss b/data/styles/vehicle/include/Basemap.mapcss index f2d991eb13..0900e48243 100644 --- a/data/styles/vehicle/include/Basemap.mapcss +++ b/data/styles/vehicle/include/Basemap.mapcss @@ -113,7 +113,6 @@ line[waterway=riverbank], line[waterway=stream], line[waterway=canal], line[natural=strait], -line[waterway=lock], line[waterway=ditch], line[waterway=drain], {z-index: 50;} @@ -328,7 +327,6 @@ line|z10-[waterway=river], line|z10-[waterway=riverbank], line|z13-[waterway=canal], line|z13-[natural=strait], -line|z16-[waterway=lock], {opacity: 1;color: @river;} /* 6.1 Area water(lake,pond etc.) */ @@ -385,8 +383,6 @@ line|z15-[natural=strait], line|z15-[waterway=stream][intermittent=yes] {width: 1.4;dashes: 4.95,4.95;}*/ -line|z16-[waterway=lock], -{width: 1.5;} node|z16-[waterway=lock_gate], {icon-image: dot-m.svg;} diff --git a/generator/generator_tests/osm_type_test.cpp b/generator/generator_tests/osm_type_test.cpp index bdb8b6a775..64b2661591 100644 --- a/generator/generator_tests/osm_type_test.cpp +++ b/generator/generator_tests/osm_type_test.cpp @@ -2066,7 +2066,6 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_SimpleTypesSmoke) {"waterway", "ditch"}, {"waterway", "dock"}, {"waterway", "drain"}, - {"waterway", "lock"}, {"waterway", "lock_gate"}, {"waterway", "river"}, {"waterway", "riverbank"}, @@ -2296,6 +2295,7 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_ComplexTypesSmoke) {{"natural", "water", "reservoir"}, {{"natural", "water"}, {"water", "reservoir"}}}, {{"natural", "water", "river"}, {{"natural", "water"}, {"water", "river"}}}, {{"natural", "water", "basin"}, {{"natural", "water"}, {"water", "basin"}}}, + {{"natural", "water", "lock"}, {{"natural", "water"}, {"water", "lock"}}}, {{"natural", "wetland", "bog"}, {{"natural", "wetland"}, {"wetland", "bog"}}}, {{"natural", "wetland", "marsh"}, {{"natural", "wetland"}, {"wetland", "marsh"}}}, {{"office"}, {{"office", "any_value"}}}, -- 2.45.3 From da97b024fedc60fc26249d0e249ccf3473262d66 Mon Sep 17 00:00:00 2001 From: Viktor Govako Date: Tue, 7 Jun 2022 16:50:45 +0300 Subject: [PATCH 3/8] [styles] Don't mix "casing-" for line and area rules. Signed-off-by: Viktor Govako --- data/styles/clear/include/Basemap.mapcss | 6 ++++-- tools/kothic | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/data/styles/clear/include/Basemap.mapcss b/data/styles/clear/include/Basemap.mapcss index 330fc3ecd5..cec6747fee 100644 --- a/data/styles/clear/include/Basemap.mapcss +++ b/data/styles/clear/include/Basemap.mapcss @@ -637,6 +637,7 @@ line|z18[man_made=cutline], line|z19-[man_made=cutline], {width: 6;} + /* 8.2 Building */ area|z14[building], @@ -665,7 +666,7 @@ area|z17[building:part], area|z17[waterway=dam], area|z17[landuse=garages], area|z17[building=train_station], -{fill-color: @building_dark;opacity: 0.9;casing-width: 1;casing-color: @building_dark_border;} +{fill-color: @building_dark;casing-width: 1;casing-color: @building_dark_border;} area|z17-[aeroway=terminal], area|z18-[building], @@ -673,7 +674,8 @@ area|z18-[building:part], area|z18-[waterway=dam], area|z18-[landuse=garages], area|z18-[building=train_station], -{fill-color: @building_dark;opacity: 1;casing-width: 1;casing-color: @building_dark_border;} +{fill-color: @building_dark;casing-width: 1;casing-color: @building_dark_border;} + /* 8.3 Barrier */ diff --git a/tools/kothic b/tools/kothic index 89b59de837..d6a507cfc0 160000 --- a/tools/kothic +++ b/tools/kothic @@ -1 +1 @@ -Subproject commit 89b59de837d5751c3247cd20a803b55a7b320f05 +Subproject commit d6a507cfc09638d489588f2cbd32569f34004318 -- 2.45.3 From eb7676a599e6b37c3dc8047f1405afa4b96c2066 Mon Sep 17 00:00:00 2001 From: Viktor Govako Date: Tue, 7 Jun 2022 19:08:45 +0300 Subject: [PATCH 4/8] [styles] Fixed "barrier" opacity and dash-dot. Signed-off-by: Viktor Govako --- data/styles/clear/include/Basemap.mapcss | 29 ++++++++------------ data/styles/vehicle/include/Basemap.mapcss | 32 ++++++++++++---------- 2 files changed, 30 insertions(+), 31 deletions(-) diff --git a/data/styles/clear/include/Basemap.mapcss b/data/styles/clear/include/Basemap.mapcss index cec6747fee..e9a4464772 100644 --- a/data/styles/clear/include/Basemap.mapcss +++ b/data/styles/clear/include/Basemap.mapcss @@ -679,35 +679,30 @@ area|z18-[building=train_station], /* 8.3 Barrier */ -line|z16-[barrier=wall], line|z16-[barrier=city_wall], -line|z16-[barrier=retaining_wall], -line|z16-[barrier=hedge], line|z16-[barrier=fence], +line|z16-[barrier=hedge], +line|z16-[barrier=retaining_wall], +line|z16-[barrier=wall], line|z16-[historic=citywalls], -{color: @fence;opacity: 1;} +{color: @fence; width: 1.0; dashes: 1.0,1.0; opacity: 0.5;} -line|z16[barrier=wall], -line|z16[barrier=city_wall], -line|z16[barrier=retaining_wall], -line|z16[barrier=fence], -line|z16[barrier=hedge], -line|z16[historic=citywalls], -{width: 0.7;dashes: 0.12,0.12;opacity: 0.5;} -line|z17-[barrier=wall], line|z17-[barrier=city_wall], -line|z17-[barrier=retaining_wall], line|z17-[barrier=fence], line|z17-[barrier=hedge], +line|z17-[barrier=retaining_wall], +line|z17-[barrier=wall], line|z17-[historic=citywalls], -{width: 1.0;dashes: 0.25,0.25;opacity:0.7;} -line|z18-[barrier=wall], +{width: 1.5; dashes: 2.0,2.0; opacity:0.7;} + line|z18-[barrier=city_wall], -line|z18-[barrier=retaining_wall], line|z18-[barrier=fence], line|z18-[barrier=hedge], +line|z18-[barrier=retaining_wall], +line|z18-[barrier=wall], line|z18-[historic=citywalls], -{width: 1.4;dashes: 0.3,0.3;} +{width: 2.0; dashes: 2.4,2.4; opacity: 1;} + /* 9. ISOLINES */ diff --git a/data/styles/vehicle/include/Basemap.mapcss b/data/styles/vehicle/include/Basemap.mapcss index 0900e48243..e46c2bc826 100644 --- a/data/styles/vehicle/include/Basemap.mapcss +++ b/data/styles/vehicle/include/Basemap.mapcss @@ -567,8 +567,8 @@ line|z18[man_made=cutline], line|z19-[man_made=cutline], {width: 6;} -/* 8.2 Building */ +/* 8.2 Building */ area|z15[building], area|z15[waterway=dam], @@ -584,25 +584,29 @@ area|z16-[landuse=garages], area|z16-[building=train_station], {fill-color: @building;fill-opacity: 0.55;casing-width: 1;casing-color: @building_border;} + /* 8.3 Barrier */ +line|z16-[barrier=city_wall], +line|z16-[barrier=fence], +line|z16-[barrier=hedge], +line|z16-[barrier=retaining_wall], +line|z16-[barrier=wall], +line|z16-[historic=citywalls], +{color: @fence; width: 1.0; dashes: 1.0,1.0; opacity: 0.5;} - -line|z16[barrier=wall], -line|z16[barrier=city_wall], -line|z16[barrier=fence], -line|z16[barrier=hedge], -/*line|z16[historic=citywalls],*/ -{width: 0.7;dashes: 0.12,0.12;opacity: 0.5;} -line|z17-[barrier=wall], line|z17-[barrier=city_wall], line|z17-[barrier=fence], line|z17-[barrier=hedge], -/*line|z17-[historic=citywalls],*/ -{width: 1.0;dashes: 0.25,0.25;opacity:0.7;} -line|z18-[barrier=wall], +line|z17-[barrier=retaining_wall], +line|z17-[barrier=wall], +line|z17-[historic=citywalls], +{width: 1.5; dashes: 2.0,2.0; opacity: 0.7;} + line|z18-[barrier=city_wall], line|z18-[barrier=fence], line|z18-[barrier=hedge], -/*line|z18-[historic=citywalls],*/ -{width: 1.4;dashes: 0.3,0.3;} +line|z18-[barrier=retaining_wall], +line|z18-[barrier=wall], +line|z18-[historic=citywalls], +{width: 2.0; dashes: 2.4,2.4; opacity: 1;} -- 2.45.3 From b2478eff5516fad63a743d98e2eeff27ed4383a2 Mon Sep 17 00:00:00 2001 From: Viktor Govako Date: Tue, 7 Jun 2022 19:52:43 +0300 Subject: [PATCH 5/8] [classifier] Added linear cliff, earth_bank, embankment. Signed-off-by: Viktor Govako --- data/mapcss-mapping.csv | 4 ++-- data/styles/clear/include/Basemap.mapcss | 15 +++++++++++++++ data/styles/vehicle/include/Basemap.mapcss | 16 ++++++++++++++++ generator/generator_tests/osm_type_test.cpp | 8 +++++--- 4 files changed, 38 insertions(+), 5 deletions(-) diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv index ef3aee3c24..0d49ee05d1 100644 --- a/data/mapcss-mapping.csv +++ b/data/mapcss-mapping.csv @@ -947,8 +947,8 @@ office|government;947; office|estate_agent;[office=estate_agent],[shop=estate_agent];;name;int_name;948; office|lawyer;949; office;[office];;name;int_name;950; -deprecated|deprecated;951;x -deprecated|deprecated;952;x +natural|earth_bank;951; +man_made|embankment;952; amenity|ferry_terminal;953; amenity;[amenity];;name;int_name;954; shop|furniture;955; diff --git a/data/styles/clear/include/Basemap.mapcss b/data/styles/clear/include/Basemap.mapcss index e9a4464772..984b97d300 100644 --- a/data/styles/clear/include/Basemap.mapcss +++ b/data/styles/clear/include/Basemap.mapcss @@ -703,6 +703,21 @@ line|z18-[barrier=wall], line|z18-[historic=citywalls], {width: 2.0; dashes: 2.4,2.4; opacity: 1;} +/* ToDo: Make linear style with small triangles pointing downwards, when drape will be ready */ +line|z16-[natural=cliff], +line|z16-[natural=earth_bank], +line|z16-[man_made=embankment], +{color: @fence; width: 1.0; opacity: 0.5;} + +line|z17[natural=cliff], +line|z17[natural=earth_bank], +line|z17[man_made=embankment], +{width: 2.0; opacity: 0.7;} + +line|z18-[natural=cliff], +line|z18-[natural=earth_bank], +line|z18-[man_made=embankment], +{width: 3.0; opacity: 1;} /* 9. ISOLINES */ diff --git a/data/styles/vehicle/include/Basemap.mapcss b/data/styles/vehicle/include/Basemap.mapcss index e46c2bc826..bf575738fd 100644 --- a/data/styles/vehicle/include/Basemap.mapcss +++ b/data/styles/vehicle/include/Basemap.mapcss @@ -610,3 +610,19 @@ line|z18-[barrier=retaining_wall], line|z18-[barrier=wall], line|z18-[historic=citywalls], {width: 2.0; dashes: 2.4,2.4; opacity: 1;} + +/* ToDo: Make linear style with small triangles pointing downwards, when drape will be ready */ +line|z16-[natural=cliff], +line|z16-[natural=earth_bank], +line|z16-[man_made=embankment], +{color: @fence; width: 1.0; opacity: 0.5;} + +line|z17[natural=cliff], +line|z17[natural=earth_bank], +line|z17[man_made=embankment], +{width: 2.0; opacity: 0.7;} + +line|z18-[natural=cliff], +line|z18-[natural=earth_bank], +line|z18-[man_made=embankment], +{width: 3.0; opacity: 1;} diff --git a/generator/generator_tests/osm_type_test.cpp b/generator/generator_tests/osm_type_test.cpp index 64b2661591..240e70af19 100644 --- a/generator/generator_tests/osm_type_test.cpp +++ b/generator/generator_tests/osm_type_test.cpp @@ -1414,9 +1414,7 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_Cliff) auto const params = GetFeatureBuilderParams(tags); - /// @todo natural=cliff is not drawable now .. - TEST_EQUAL(params.m_types.size(), 0, (params)); - //TEST(params.IsTypeExist(GetType({"natural", "cliff"})), (params)); + TEST(params.IsTypeExist(GetType({"natural", "cliff"})), (params)); } } @@ -1664,6 +1662,7 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_SimpleTypesSmoke) {"boundary", "national_park"}, {"building", "has_parts"}, {"building", "train_station"}, + {"cemetery", "grave"}, {"craft", "brewery"}, {"craft", "carpenter"}, {"craft", "electrician"}, @@ -1867,6 +1866,7 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_SimpleTypesSmoke) {"man_made", "breakwater"}, {"man_made", "chimney"}, {"man_made", "cutline"}, + {"man_made", "embankment"}, {"man_made", "lighthouse"}, {"man_made", "survey_point"}, {"man_made", "pier"}, @@ -1880,7 +1880,9 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_SimpleTypesSmoke) {"natural", "beach"}, {"natural", "cape"}, {"natural", "cave_entrance"}, + {"natural", "cliff"}, {"natural", "coastline"}, + {"natural", "earth_bank"}, {"natural", "geyser"}, {"natural", "glacier"}, {"natural", "grassland"}, -- 2.45.3 From f3a8da34dcc336fa39b2501ea6d1ecc6f752e374 Mon Sep 17 00:00:00 2001 From: Viktor Govako Date: Thu, 9 Jun 2022 16:22:00 +0300 Subject: [PATCH 6/8] [classifier] Added more craft=* types. Signed-off-by: Viktor Govako --- data/categories.txt | 22 ++++++++++++++- data/editor.config | 23 ++++++++++++++- data/mapcss-mapping.csv | 14 +++++----- data/replaced_tags.txt | 2 ++ data/strings/types_strings.txt | 28 +++++++++++++++++++ generator/generator_tests/osm_type_test.cpp | 7 +++++ .../search_integration_tests/smoke_test.cpp | 7 +++-- 7 files changed, 92 insertions(+), 11 deletions(-) diff --git a/data/categories.txt b/data/categories.txt index 2ca778537e..fc9a2bff48 100644 --- a/data/categories.txt +++ b/data/categories.txt @@ -1767,7 +1767,7 @@ el:Κατάστημα πληροφορικής sk:Obchod s výpočtovou technikou fa:فروشگاه کامپیوتر -shop-confectionery|@food +shop-confectionery|craft-confectionery en:4Sweets|4confectionery|candies|candy store|U+1F36C|U+1F36D|cake shop|sweetshop|tuck shop|pastry|candy shop|cake shop en-AU:Lollies|Candy ru:4Кондитерская|кондитерские изделия|сладости|торты|десерты|пирожные @@ -7085,6 +7085,14 @@ sk:Mobilný operátor fa:اپراتور تلفن همراه mr:दूरसंचार कंपनी +craft-beekeeper +en:Beekeeper +ru:Пчеловод + +craft-blacksmith +en:Blacksmith +ru:Кузнец + craft-brewery en:Craft brewery|4Brewery|brew house|beer|beer bar|craft beer ru:5Пивоварня|пивзавод|производство пива|пивоваренный завод @@ -7190,6 +7198,14 @@ sk:4Elektrikár fa:برق کار mr:इलेक्ट्रिशियन|विद्युत कामगार +craft-electronics_repair +en:Electronics repair +ru:Ремонт электроники + +craft-handicraft +en:Handicraft +ru:Декоратор + craft-metal_construction en:5Metal Worker ru:5Металлоконструкции|кузнец @@ -7296,6 +7312,10 @@ sk:Oprava obuvy fa:کفاش mr:चांभार +craft-winery +en:4Winery|Wine +ru:4Винодельня|Вино + craft-tailor en:4Tailor|clothes alteration|alterations ru:4Ателье|портной|4ремонт одежды|швейная мастерская|5пошив одежды diff --git a/data/editor.config b/data/editor.config index e0cd8a9f6d..23f3775e57 100644 --- a/data/editor.config +++ b/data/editor.config @@ -370,18 +370,33 @@ + + + + + + + + + + + + + + + @@ -391,18 +406,24 @@ - + + + + + + + diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv index 0d49ee05d1..9907852950 100644 --- a/data/mapcss-mapping.csv +++ b/data/mapcss-mapping.csv @@ -952,9 +952,9 @@ man_made|embankment;952; amenity|ferry_terminal;953; amenity;[amenity];;name;int_name;954; shop|furniture;955; -deprecated|deprecated;956;x +craft|winery;956; waterway|waterfall;957; -deprecated|deprecated;958;x +craft|electronics_repair;958; amenity|casino;960; amenity|brothel;961; place|neighbourhood;[place=neighbourhood],[place=quarter];;name;int_name;962; @@ -983,7 +983,7 @@ internet_access;[internet_access];;name;int_name;984; internet_access|wlan;985; amenity|waste_disposal;986; amenity|bbq;987; -deprecated|deprecated;988;x +craft|sawmill;988; route|ferry|motorcar;[route=ferry][motorcar];x;name;int_name;989;route|ferry junction|roundabout;990; highway|speed_camera;991; @@ -1056,16 +1056,16 @@ shop|photo;1057; shop|travel_agency;[shop=travel_agency],[office=travel_agent];;name;int_name;1058; highway|elevator;1059; shop|outdoor;1060; -deprecated|deprecated;1061;x -deprecated|deprecated;1062;x +craft|confectionery;1061; +craft|handicraft;1062; shop|dry_cleaning;1063; shop|tyres;1064; -deprecated|deprecated;1065;x +craft|beekeeper;1065; amenity|car_wash;1066; amenity|veterinary;1067; amenity|charging_station;1068; amenity|childcare;1069; -deprecated|deprecated;1070;x +craft|blacksmith;1070; amenity|bicycle_parking;1071; amenity|community_centre;1072; amenity|courthouse;1073; diff --git a/data/replaced_tags.txt b/data/replaced_tags.txt index 219a518818..fa5cd21288 100644 --- a/data/replaced_tags.txt +++ b/data/replaced_tags.txt @@ -73,6 +73,8 @@ cliff=yes : natural=cliff office=notary : office=lawyer office=administrative : office=government +craft=dressmaker : craft=tailor + cycleway=opposite_lane : oneway:bicycle=no power=transformer : power=substation diff --git a/data/strings/types_strings.txt b/data/strings/types_strings.txt index b8c8ef87ea..a0c7556586 100644 --- a/data/strings/types_strings.txt +++ b/data/strings/types_strings.txt @@ -4812,6 +4812,14 @@ uk = Майстерня zh-Hans = 工艺作坊 + [type.craft.beekeeper] + en = beekeeper + ru = Пчеловод + + [type.craft.blacksmith] + en = Blacksmith + ru = Кузнец + [type.craft.brewery] en = Craft Brewery ar = مصنع جعة @@ -4880,6 +4888,10 @@ zh-Hans = 木匠 zh-Hant = 木工 + [type.craft.confectionery] + en = Confectionery + ru = Кондитер + [type.craft.electrician] en = Electrician ar = كهربائي @@ -4913,6 +4925,10 @@ zh-Hans = 电工 zh-Hant = 電工 + [type.craft.electronics_repair] + en = Electronics repair + ru = Ремонт электроники + [type.craft.gardener] en = Gardener ar = مهندس مناظر @@ -4947,6 +4963,10 @@ zh-Hans = 园艺工 zh-Hant = 園藝師 + [type.craft.handicraft] + en = Handicraft + ru = Декоративный мастер + [type.craft.hvac] en = Hvac ar = تكييف @@ -5115,6 +5135,10 @@ zh-Hans = 管道工 zh-Hant = 水管工人 + [type.craft.sawmill] + en = Sawmill + ru = Лесопилка + [type.craft.shoemaker] en = Shoe Repair ar = تصليح الاحذية @@ -5149,6 +5173,10 @@ zh-Hans = 鞋匠 zh-Hant = 修鞋工 + [type.craft.winery] + en = Winery + ru = Винодельня + [type.craft.tailor] en = Tailor ar = خياط diff --git a/generator/generator_tests/osm_type_test.cpp b/generator/generator_tests/osm_type_test.cpp index 240e70af19..dfa17790da 100644 --- a/generator/generator_tests/osm_type_test.cpp +++ b/generator/generator_tests/osm_type_test.cpp @@ -1663,17 +1663,24 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_SimpleTypesSmoke) {"building", "has_parts"}, {"building", "train_station"}, {"cemetery", "grave"}, + {"craft", "beekeeper"}, + {"craft", "blacksmith"}, {"craft", "brewery"}, {"craft", "carpenter"}, + {"craft", "confectionery"}, {"craft", "electrician"}, + {"craft", "electronics_repair"}, {"craft", "gardener"}, + {"craft", "handicraft"}, {"craft", "hvac"}, {"craft", "metal_construction"}, {"craft", "painter"}, {"craft", "photographer"}, {"craft", "plumber"}, + {"craft", "sawmill"}, {"craft", "shoemaker"}, {"craft", "tailor"}, + {"craft", "winery"}, {"cuisine", "african"}, {"cuisine", "american"}, {"cuisine", "arab"}, diff --git a/search/search_integration_tests/smoke_test.cpp b/search/search_integration_tests/smoke_test.cpp index a62a19f255..cf187cde85 100644 --- a/search/search_integration_tests/smoke_test.cpp +++ b/search/search_integration_tests/smoke_test.cpp @@ -117,8 +117,11 @@ UNIT_CLASS_TEST(SmokeTest, Smoke) SetViewport(m2::RectD(m2::PointD(0, 0), m2::PointD(100, 100))); { - Rules rules = {ExactMatch(id, wineShop)}; - TEST(ResultsMatch("wine ", rules), ()); + Rules rules = {ExactMatch(id, tequilaShop)}; + /// @todo Passing "wine" will interpret request as "categorial" only + /// (see IsCategorialRequest() after adding craft-winery category). + /// Should avoid this strange logic in search core and pass "categorial" request flag via input SearchParams. + TEST(ResultsMatch("tequila ", rules), ()); } { -- 2.45.3 From f76e9ab8b6c8428bbdb4eafed01752c8ed1d9797 Mon Sep 17 00:00:00 2001 From: Viktor Govako Date: Thu, 9 Jun 2022 16:21:33 +0300 Subject: [PATCH 7/8] [styles] Regenerated. Signed-off-by: Viktor Govako --- data/classificator.txt | 14 +- data/colors.txt | 3 - data/drules_proto.bin | Bin 212792 -> 214967 bytes data/drules_proto.txt | 959 ++++++++++++++++++++++++---- data/drules_proto_clear.bin | Bin 213520 -> 215695 bytes data/drules_proto_clear.txt | 959 ++++++++++++++++++++++++---- data/drules_proto_dark.bin | Bin 211974 -> 214077 bytes data/drules_proto_dark.txt | 959 ++++++++++++++++++++++++---- data/drules_proto_vehicle_clear.bin | Bin 140473 -> 142960 bytes data/drules_proto_vehicle_clear.txt | 866 +++++++++++++++++++++---- data/drules_proto_vehicle_dark.bin | Bin 139459 -> 141847 bytes data/drules_proto_vehicle_dark.txt | 866 +++++++++++++++++++++---- data/patterns.txt | 3 +- data/types.txt | 24 +- data/visibility.txt | 20 +- 15 files changed, 3964 insertions(+), 709 deletions(-) diff --git a/data/classificator.txt b/data/classificator.txt index 02ac1e57a7..c941203625 100644 --- a/data/classificator.txt +++ b/data/classificator.txt @@ -199,19 +199,29 @@ world + train_station - {} building:part - + cemetery + + grave - + {} complex_entry - craft + + beekeeper - + blacksmith - brewery - carpenter - + confectionery - electrician - + electronics_repair - gardener - + handicraft - hvac - metal_construction - painter - photographer - plumber - + sawmill - shoemaker - tailor - + winery - {} cuisine + african - @@ -578,6 +588,7 @@ world + cairn - chimney - cutline - + embankment - flagpole - lighthouse - mast - @@ -613,6 +624,7 @@ world + cave_entrance - cliff - coastline - + earth_bank - geyser - glacier - grassland - @@ -631,6 +643,7 @@ world + water + basin - lake - + lock - pond - reservoir - river - @@ -981,7 +994,6 @@ world + drain + tunnel - {} - lock - lock_gate - river + tunnel - diff --git a/data/colors.txt b/data/colors.txt index 4537723866..d13043eedd 100644 --- a/data/colors.txt +++ b/data/colors.txt @@ -296,11 +296,9 @@ 67108863 436207616 437326080 -439563059 440681540 442260561 444234362 -448970931 451800027 452984831 609045837 @@ -333,7 +331,6 @@ 1074860288 1090519039 1216522952 -1291845632 1292174597 1292964096 1295201075 diff --git a/data/drules_proto.bin b/data/drules_proto.bin index 3babf86aee54a566f0a4a36fd5627de05066b230..f54a45fa9c7fe5076faf0a177877b6feba3146e6 100644 GIT binary patch delta 1481 zcmdn-k7s*7?}mT*j0Y$G&zELr0D}*c6$`Z4f7lDm-2Cj#WW!rxp&Ph`G&zKXR5>9E z7#u)SEK)*T0>)s#>;R(`z)FRQQ9AiR!A$wRj9k1)iA6=3sYSYJsd>q%LRuUGLTXTp z=;adeqN$8~C$B9Mr*jBo6(3Z(l7I%OwnvPtMOvOHD4x%+CW_ z1yr(3Dv3)1B9)p0lqky2%SDuto?--9 z!CstLo|~DI1Ge&iJLlvlU90%RxOgDumS;lk^4#3lEq+<$5F?jRMrLtIeo}^Zxp?yuOG=9pb99q) zGSkwiZq3PyjAt1gi@1bf)}$sDm1M+&yhU}pre0<&kz>ipPtM-1_?_`5%k&p-7=_w7 zKQV6S{KOP&#q^44dYle(Il`MS)yKp7!;s7j#8 Y2*YI*kYseWE9o(RWZJ&aka;>U08*HSP5=M^ delta 1025 zcmdnq&%5Iv&xU{bjE5)x&zELT1A}Li6$`XEKG+M)-2Chf%k)NbW>N7C+(KF$LPBbs z5GCI*C55p|PTpTILw-La7jIHxQBh`Uk#1UQUUDkXFafxF>e?q#GzG=JjMS8LTH2Rd ze3Y~x5A%)@{NuylV5knPF~X$wK=K# z6yxO9-p!jQ^od_)JTiSnBBKl~e7Zd|iP0fxyWCMmMS<<>t}>os-2U!5W3gO&!EeUx z1;3est(cB5Pd{qPoGujxOgo~S3}7JQATaG<8>V@IzRj{iE8UwTd ztX^lkzB%(pruuGRCMZuVNi8Z*tkliPPtF#S1$smhYQYbCf&C9}F)B=G`wsz(Kxskz V(n9#9g;AvWP)*-1Z^b-=7XSiqSfu~} diff --git a/data/drules_proto.txt b/data/drules_proto.txt index 12f4efe43d..911cfbc0b3 100644 --- a/data/drules_proto.txt +++ b/data/drules_proto.txt @@ -9649,7 +9649,7 @@ cont { element { scale: 16 lines { - width: 0.7 + width: 1.0 color: 2157549977 dashdot { dd: 1.0 @@ -9661,11 +9661,11 @@ cont { element { scale: 17 lines { - width: 1.0 + width: 1.5 color: 1301911961 dashdot { - dd: 1.0 - dd: 1.0 + dd: 2.0 + dd: 2.0 } priority: 1456 } @@ -9673,11 +9673,11 @@ cont { element { scale: 18 lines { - width: 1.4 - color: 1301911961 + width: 2.0 + color: 10066329 dashdot { - dd: 1.0 - dd: 1.0 + dd: 2.4 + dd: 2.4 } priority: 1456 } @@ -9685,11 +9685,11 @@ cont { element { scale: 19 lines { - width: 1.4 - color: 1301911961 + width: 2.0 + color: 10066329 dashdot { - dd: 1.0 - dd: 1.0 + dd: 2.4 + dd: 2.4 } priority: 1456 } @@ -9763,7 +9763,7 @@ cont { element { scale: 16 lines { - width: 0.7 + width: 1.0 color: 2157549977 dashdot { dd: 1.0 @@ -9775,11 +9775,11 @@ cont { element { scale: 17 lines { - width: 1.0 + width: 1.5 color: 1301911961 dashdot { - dd: 1.0 - dd: 1.0 + dd: 2.0 + dd: 2.0 } priority: 1456 } @@ -9787,11 +9787,11 @@ cont { element { scale: 18 lines { - width: 1.4 - color: 1301911961 + width: 2.0 + color: 10066329 dashdot { - dd: 1.0 - dd: 1.0 + dd: 2.4 + dd: 2.4 } priority: 1456 } @@ -9799,11 +9799,11 @@ cont { element { scale: 19 lines { - width: 1.4 - color: 1301911961 + width: 2.0 + color: 10066329 dashdot { - dd: 1.0 - dd: 1.0 + dd: 2.4 + dd: 2.4 } priority: 1456 } @@ -9877,7 +9877,7 @@ cont { element { scale: 16 lines { - width: 0.7 + width: 1.0 color: 2157549977 dashdot { dd: 1.0 @@ -9889,11 +9889,11 @@ cont { element { scale: 17 lines { - width: 1.0 + width: 1.5 color: 1301911961 dashdot { - dd: 1.0 - dd: 1.0 + dd: 2.0 + dd: 2.0 } priority: 1456 } @@ -9901,11 +9901,11 @@ cont { element { scale: 18 lines { - width: 1.4 - color: 1301911961 + width: 2.0 + color: 10066329 dashdot { - dd: 1.0 - dd: 1.0 + dd: 2.4 + dd: 2.4 } priority: 1456 } @@ -9913,11 +9913,11 @@ cont { element { scale: 19 lines { - width: 1.4 - color: 1301911961 + width: 2.0 + color: 10066329 dashdot { - dd: 1.0 - dd: 1.0 + dd: 2.4 + dd: 2.4 } priority: 1456 } @@ -9998,7 +9998,7 @@ cont { element { scale: 16 lines { - width: 0.7 + width: 1.0 color: 2157549977 dashdot { dd: 1.0 @@ -10010,11 +10010,11 @@ cont { element { scale: 17 lines { - width: 1.0 + width: 1.5 color: 1301911961 dashdot { - dd: 1.0 - dd: 1.0 + dd: 2.0 + dd: 2.0 } priority: 1456 } @@ -10022,11 +10022,11 @@ cont { element { scale: 18 lines { - width: 1.4 - color: 1301911961 + width: 2.0 + color: 10066329 dashdot { - dd: 1.0 - dd: 1.0 + dd: 2.4 + dd: 2.4 } priority: 1456 } @@ -10034,11 +10034,11 @@ cont { element { scale: 19 lines { - width: 1.4 - color: 1301911961 + width: 2.0 + color: 10066329 dashdot { - dd: 1.0 - dd: 1.0 + dd: 2.4 + dd: 2.4 } priority: 1456 } @@ -10302,7 +10302,7 @@ cont { element { scale: 16 lines { - width: 0.7 + width: 1.0 color: 2157549977 dashdot { dd: 1.0 @@ -10314,11 +10314,11 @@ cont { element { scale: 17 lines { - width: 1.0 + width: 1.5 color: 1301911961 dashdot { - dd: 1.0 - dd: 1.0 + dd: 2.0 + dd: 2.0 } priority: 1456 } @@ -10326,11 +10326,11 @@ cont { element { scale: 18 lines { - width: 1.4 - color: 1301911961 + width: 2.0 + color: 10066329 dashdot { - dd: 1.0 - dd: 1.0 + dd: 2.4 + dd: 2.4 } priority: 1456 } @@ -10338,11 +10338,11 @@ cont { element { scale: 19 lines { - width: 1.4 - color: 1301911961 + width: 2.0 + color: 10066329 dashdot { - dd: 1.0 - dd: 1.0 + dd: 2.4 + dd: 2.4 } priority: 1456 } @@ -11646,6 +11646,124 @@ cont { } } } +cont { + name: "cemetery-grave" + element { + scale: 17 + symbol { + name: "cemetery-m" + priority: 16398 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15398 + } + } + element { + scale: 18 + symbol { + name: "cemetery-m" + priority: 16398 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15398 + } + } + element { + scale: 19 + symbol { + name: "cemetery-m" + priority: 16398 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15398 + } + } +} +cont { + name: "craft-beekeeper" + element { + scale: 18 + symbol { + name: "hand-m" + priority: 16601 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15601 + } + } + element { + scale: 19 + symbol { + name: "hand-m" + priority: 16601 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15601 + } + } +} +cont { + name: "craft-blacksmith" + element { + scale: 18 + symbol { + name: "hand-m" + priority: 16601 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15601 + } + } + element { + scale: 19 + symbol { + name: "hand-m" + priority: 16601 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15601 + } + } +} cont { name: "craft-brewery" element { @@ -11716,6 +11834,41 @@ cont { } } } +cont { + name: "craft-confectionery" + element { + scale: 18 + symbol { + name: "hand-m" + priority: 16601 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15601 + } + } + element { + scale: 19 + symbol { + name: "hand-m" + priority: 16601 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15601 + } + } +} cont { name: "craft-electrician" element { @@ -11751,6 +11904,41 @@ cont { } } } +cont { + name: "craft-electronics_repair" + element { + scale: 18 + symbol { + name: "hand-m" + priority: 16601 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15601 + } + } + element { + scale: 19 + symbol { + name: "hand-m" + priority: 16601 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15601 + } + } +} cont { name: "craft-gardener" element { @@ -11786,6 +11974,41 @@ cont { } } } +cont { + name: "craft-handicraft" + element { + scale: 18 + symbol { + name: "hand-m" + priority: 16601 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15601 + } + } + element { + scale: 19 + symbol { + name: "hand-m" + priority: 16601 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15601 + } + } +} cont { name: "craft-hvac" element { @@ -11961,6 +12184,41 @@ cont { } } } +cont { + name: "craft-sawmill" + element { + scale: 18 + symbol { + name: "hand-m" + priority: 16601 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15601 + } + } + element { + scale: 19 + symbol { + name: "hand-m" + priority: 16601 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15601 + } + } +} cont { name: "craft-shoemaker" element { @@ -12031,6 +12289,41 @@ cont { } } } +cont { + name: "craft-winery" + element { + scale: 18 + symbol { + name: "hand-m" + priority: 16601 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15601 + } + } + element { + scale: 19 + symbol { + name: "hand-m" + priority: 16601 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15601 + } + } +} cont { name: "emergency-defibrillator" element { @@ -29879,7 +30172,7 @@ cont { element { scale: 16 lines { - width: 0.7 + width: 1.0 color: 2157549977 dashdot { dd: 1.0 @@ -29891,11 +30184,11 @@ cont { element { scale: 17 lines { - width: 1.0 + width: 1.5 color: 1301911961 dashdot { - dd: 1.0 - dd: 1.0 + dd: 2.0 + dd: 2.0 } priority: 1456 } @@ -29903,11 +30196,11 @@ cont { element { scale: 18 lines { - width: 1.4 - color: 1301911961 + width: 2.0 + color: 10066329 dashdot { - dd: 1.0 - dd: 1.0 + dd: 2.4 + dd: 2.4 } priority: 1456 } @@ -29915,11 +30208,11 @@ cont { element { scale: 19 lines { - width: 1.4 - color: 1301911961 + width: 2.0 + color: 10066329 dashdot { - dd: 1.0 - dd: 1.0 + dd: 2.4 + dd: 2.4 } priority: 1456 } @@ -38218,6 +38511,41 @@ cont { } } } +cont { + name: "man_made-embankment" + element { + scale: 16 + lines { + width: 1.0 + color: 2157549977 + priority: 1000 + } + } + element { + scale: 17 + lines { + width: 2.0 + color: 1301911961 + priority: 1000 + } + } + element { + scale: 18 + lines { + width: 3.0 + color: 10066329 + priority: 1000 + } + } + element { + scale: 19 + lines { + width: 3.0 + color: 10066329 + priority: 1000 + } + } +} cont { name: "man_made-flagpole" element { @@ -39704,6 +40032,41 @@ cont { } } } +cont { + name: "natural-cliff" + element { + scale: 16 + lines { + width: 1.0 + color: 2157549977 + priority: 1000 + } + } + element { + scale: 17 + lines { + width: 2.0 + color: 1301911961 + priority: 1000 + } + } + element { + scale: 18 + lines { + width: 3.0 + color: 10066329 + priority: 1000 + } + } + element { + scale: 19 + lines { + width: 3.0 + color: 10066329 + priority: 1000 + } + } +} cont { name: "natural-coastline" element { @@ -39846,6 +40209,41 @@ cont { } } } +cont { + name: "natural-earth_bank" + element { + scale: 16 + lines { + width: 1.0 + color: 2157549977 + priority: 1000 + } + } + element { + scale: 17 + lines { + width: 2.0 + color: 1301911961 + priority: 1000 + } + } + element { + scale: 18 + lines { + width: 3.0 + color: 10066329 + priority: 1000 + } + } + element { + scale: 19 + lines { + width: 3.0 + color: 10066329 + priority: 1000 + } + } +} cont { name: "natural-geyser" element { @@ -42224,6 +42622,350 @@ cont { apply_if: "bbox_area<4000000" } } +cont { + name: "natural-water-lock" + element { + area { + color: 9163744 + priority: -15030 + } + } + element { + scale: 1 + area { + color: 9163744 + priority: -15030 + } + } + element { + scale: 2 + area { + color: 9163744 + priority: -15030 + } + } + element { + scale: 3 + area { + color: 9163744 + priority: -15030 + } + } + element { + scale: 4 + area { + color: 9163744 + priority: -15030 + } + } + element { + scale: 5 + area { + color: 9163744 + priority: -15030 + } + } + element { + scale: 6 + area { + color: 9163744 + priority: -15030 + } + } + element { + scale: 7 + area { + color: 9163744 + priority: -15030 + } + } + element { + scale: 8 + area { + color: 9163744 + priority: -15030 + } + } + element { + scale: 9 + area { + color: 9163744 + priority: -15030 + } + } + element { + scale: 10 + area { + color: 9163744 + priority: -15030 + } + caption { + primary { + height: 9 + color: 4495803 + } + priority: 15970 + } + apply_if: "bbox_area>=4000000" + } + element { + scale: 10 + area { + color: 9163744 + priority: -15030 + } + apply_if: "bbox_area<4000000" + } + element { + scale: 11 + area { + color: 9163744 + priority: -15030 + } + caption { + primary { + height: 9 + color: 4495803 + } + priority: 15970 + } + apply_if: "bbox_area>=4000000" + } + element { + scale: 11 + area { + color: 9163744 + priority: -15030 + } + apply_if: "bbox_area<4000000" + } + element { + scale: 12 + area { + color: 9163744 + priority: -15030 + } + caption { + primary { + height: 9 + color: 4495803 + } + priority: 15970 + } + apply_if: "bbox_area>=4000000" + } + element { + scale: 12 + area { + color: 9163744 + priority: -15030 + } + apply_if: "bbox_area<4000000" + } + element { + scale: 13 + area { + color: 9163744 + priority: -15030 + } + caption { + primary { + height: 9 + color: 4495803 + } + priority: 15970 + } + apply_if: "bbox_area>=4000000" + } + element { + scale: 13 + area { + color: 9163744 + priority: -15030 + } + apply_if: "bbox_area<4000000" + } + element { + scale: 14 + area { + color: 9163744 + priority: -15030 + } + caption { + primary { + height: 10 + color: 4495803 + } + priority: 15970 + } + apply_if: "bbox_area>=4000000" + } + element { + scale: 14 + area { + color: 9163744 + priority: -15030 + } + caption { + primary { + height: 10 + color: 4495803 + } + priority: 15970 + } + apply_if: "bbox_area<4000000" + } + element { + scale: 15 + area { + color: 9163744 + priority: -15030 + } + caption { + primary { + height: 10 + color: 4495803 + } + priority: 15970 + } + apply_if: "bbox_area>=4000000" + } + element { + scale: 15 + area { + color: 9163744 + priority: -15030 + } + caption { + primary { + height: 10 + color: 4495803 + } + priority: 15970 + } + apply_if: "bbox_area<4000000" + } + element { + scale: 16 + area { + color: 9163744 + priority: -15030 + } + caption { + primary { + height: 11 + color: 4495803 + } + priority: 15970 + } + apply_if: "bbox_area>=4000000" + } + element { + scale: 16 + area { + color: 9163744 + priority: -15030 + } + caption { + primary { + height: 11 + color: 4495803 + } + priority: 15970 + } + apply_if: "bbox_area<4000000" + } + element { + scale: 17 + area { + color: 9163744 + priority: -15030 + } + caption { + primary { + height: 11 + color: 4495803 + } + priority: 15970 + } + apply_if: "bbox_area>=4000000" + } + element { + scale: 17 + area { + color: 9163744 + priority: -15030 + } + caption { + primary { + height: 11 + color: 4495803 + } + priority: 15970 + } + apply_if: "bbox_area<4000000" + } + element { + scale: 18 + area { + color: 9163744 + priority: -15030 + } + caption { + primary { + height: 11 + color: 4495803 + } + priority: 15970 + } + apply_if: "bbox_area>=4000000" + } + element { + scale: 18 + area { + color: 9163744 + priority: -15030 + } + caption { + primary { + height: 11 + color: 4495803 + } + priority: 15970 + } + apply_if: "bbox_area<4000000" + } + element { + scale: 19 + area { + color: 9163744 + priority: -15030 + } + caption { + primary { + height: 11 + color: 4495803 + } + priority: 15970 + } + apply_if: "bbox_area>=4000000" + } + element { + scale: 19 + area { + color: 9163744 + priority: -15030 + } + caption { + primary { + height: 11 + color: 4495803 + } + priority: 15970 + } + apply_if: "bbox_area<4000000" + } +} cont { name: "natural-water-pond" element { @@ -68517,14 +69259,6 @@ cont { } element { scale: 16 - lines { - width: 5.0 - color: 10592406 - dashdot { - } - priority: 1969 - cap: BUTTCAP - } lines { width: 3.0 color: 1304608947 @@ -68548,17 +69282,9 @@ cont { } element { scale: 17 - lines { - width: 6.5 - color: 10197647 - dashdot { - } - priority: 1969 - cap: BUTTCAP - } lines { width: 4.5 - color: 448970931 + color: 1304608947 priority: 1970 } area { @@ -68579,17 +69305,9 @@ cont { } element { scale: 18 - lines { - width: 8.0 - color: 10197647 - dashdot { - } - priority: 1969 - cap: BUTTCAP - } lines { width: 6.0 - color: 12763315 + color: 1304608947 priority: 1970 } area { @@ -68610,17 +69328,9 @@ cont { } element { scale: 19 - lines { - width: 10.0 - color: 10197647 - dashdot { - } - priority: 1969 - cap: BUTTCAP - } lines { width: 8.0 - color: 12763315 + color: 1304608947 priority: 1970 } area { @@ -68860,41 +69570,6 @@ cont { } } } -cont { - name: "waterway-lock" - element { - scale: 16 - lines { - width: 1.5 - color: 3584191 - priority: -15600 - } - } - element { - scale: 17 - lines { - width: 1.5 - color: 3584191 - priority: -15600 - } - } - element { - scale: 18 - lines { - width: 1.5 - color: 3584191 - priority: -15600 - } - } - element { - scale: 19 - lines { - width: 1.5 - color: 3584191 - priority: -15600 - } - } -} cont { name: "waterway-lock_gate" element { diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin index 98348b8275b97405b88155c43e5e42d750903bd9..dd4547be87e047a9381be732d4172051fc202753 100644 GIT binary patch delta 1461 zcmbQx!rMQUcSC+2sl$chco0OWG zotj!OnX%JbIEqUEDwva)oL!uoS&}jNew*iHn-0#&3T>;!V!4DN^2zymX{pI2nfZA@ ztH4T5x5Y{&aY;a=Q*(flMfrJ|$;I(SsRfCdlN;N-CTp}uA#BJ<%uC4xs|IP`+|+)G z5o8T}abkIHW=;;+%z`$~$)TOA_`|q(Am)~5!tC4pzjO9Q#zWI*M>ERMIoh|!#xOc2 zITdpW=O*UG=O(74>Zax)tT)??2$rH$U$IpWA{6j>3QnRx{UVI6D*iTrsu0O>i|^= Y!^2qtNtMoa4-MvzOxurZGkb~w0IXPt9RL6T delta 1004 zcmeC5$~&QjcSC+2ApI`xv=+V4+r?n3F@JK-;{p%%6XgFye* zcPvnOAt9(XAqRoYjosH6r)wHA>u3vw0#h=~L0e2U>$654Z?5@D%dpu%>i1$ zwjF4LEOUJ~Fv*uEmZTPyCsyj_L2{rtOy}=4000000" + } + element { + scale: 10 + area { + color: 9163744 + priority: -15030 + } + apply_if: "bbox_area<4000000" + } + element { + scale: 11 + area { + color: 9163744 + priority: -15030 + } + caption { + primary { + height: 9 + color: 4495803 + } + priority: 15970 + } + apply_if: "bbox_area>=4000000" + } + element { + scale: 11 + area { + color: 9163744 + priority: -15030 + } + apply_if: "bbox_area<4000000" + } + element { + scale: 12 + area { + color: 9163744 + priority: -15030 + } + caption { + primary { + height: 9 + color: 4495803 + } + priority: 15970 + } + apply_if: "bbox_area>=4000000" + } + element { + scale: 12 + area { + color: 9163744 + priority: -15030 + } + apply_if: "bbox_area<4000000" + } + element { + scale: 13 + area { + color: 9163744 + priority: -15030 + } + caption { + primary { + height: 9 + color: 4495803 + } + priority: 15970 + } + apply_if: "bbox_area>=4000000" + } + element { + scale: 13 + area { + color: 9163744 + priority: -15030 + } + apply_if: "bbox_area<4000000" + } + element { + scale: 14 + area { + color: 9163744 + priority: -15030 + } + caption { + primary { + height: 10 + color: 4495803 + } + priority: 15970 + } + apply_if: "bbox_area>=4000000" + } + element { + scale: 14 + area { + color: 9163744 + priority: -15030 + } + caption { + primary { + height: 10 + color: 4495803 + } + priority: 15970 + } + apply_if: "bbox_area<4000000" + } + element { + scale: 15 + area { + color: 9163744 + priority: -15030 + } + caption { + primary { + height: 10 + color: 4495803 + } + priority: 15970 + } + apply_if: "bbox_area>=4000000" + } + element { + scale: 15 + area { + color: 9163744 + priority: -15030 + } + caption { + primary { + height: 10 + color: 4495803 + } + priority: 15970 + } + apply_if: "bbox_area<4000000" + } + element { + scale: 16 + area { + color: 9163744 + priority: -15030 + } + caption { + primary { + height: 11 + color: 4495803 + } + priority: 15970 + } + apply_if: "bbox_area>=4000000" + } + element { + scale: 16 + area { + color: 9163744 + priority: -15030 + } + caption { + primary { + height: 11 + color: 4495803 + } + priority: 15970 + } + apply_if: "bbox_area<4000000" + } + element { + scale: 17 + area { + color: 9163744 + priority: -15030 + } + caption { + primary { + height: 11 + color: 4495803 + } + priority: 15970 + } + apply_if: "bbox_area>=4000000" + } + element { + scale: 17 + area { + color: 9163744 + priority: -15030 + } + caption { + primary { + height: 11 + color: 4495803 + } + priority: 15970 + } + apply_if: "bbox_area<4000000" + } + element { + scale: 18 + area { + color: 9163744 + priority: -15030 + } + caption { + primary { + height: 11 + color: 4495803 + } + priority: 15970 + } + apply_if: "bbox_area>=4000000" + } + element { + scale: 18 + area { + color: 9163744 + priority: -15030 + } + caption { + primary { + height: 11 + color: 4495803 + } + priority: 15970 + } + apply_if: "bbox_area<4000000" + } + element { + scale: 19 + area { + color: 9163744 + priority: -15030 + } + caption { + primary { + height: 11 + color: 4495803 + } + priority: 15970 + } + apply_if: "bbox_area>=4000000" + } + element { + scale: 19 + area { + color: 9163744 + priority: -15030 + } + caption { + primary { + height: 11 + color: 4495803 + } + priority: 15970 + } + apply_if: "bbox_area<4000000" + } +} cont { name: "natural-water-pond" element { @@ -67948,14 +68690,6 @@ cont { } element { scale: 16 - lines { - width: 5.0 - color: 10592406 - dashdot { - } - priority: 1969 - cap: BUTTCAP - } lines { width: 3.0 color: 1304608947 @@ -67979,17 +68713,9 @@ cont { } element { scale: 17 - lines { - width: 6.5 - color: 10197647 - dashdot { - } - priority: 1969 - cap: BUTTCAP - } lines { width: 4.5 - color: 448970931 + color: 1304608947 priority: 1970 } area { @@ -68010,17 +68736,9 @@ cont { } element { scale: 18 - lines { - width: 8.0 - color: 10197647 - dashdot { - } - priority: 1969 - cap: BUTTCAP - } lines { width: 6.0 - color: 12763315 + color: 1304608947 priority: 1970 } area { @@ -68041,17 +68759,9 @@ cont { } element { scale: 19 - lines { - width: 10.0 - color: 10197647 - dashdot { - } - priority: 1969 - cap: BUTTCAP - } lines { width: 8.0 - color: 12763315 + color: 1304608947 priority: 1970 } area { @@ -68291,41 +69001,6 @@ cont { } } } -cont { - name: "waterway-lock" - element { - scale: 16 - lines { - width: 1.5 - color: 3584191 - priority: -15600 - } - } - element { - scale: 17 - lines { - width: 1.5 - color: 3584191 - priority: -15600 - } - } - element { - scale: 18 - lines { - width: 1.5 - color: 3584191 - priority: -15600 - } - } - element { - scale: 19 - lines { - width: 1.5 - color: 3584191 - priority: -15600 - } - } -} cont { name: "waterway-lock_gate" element { diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin index 096e66b4f164d50ce7da21df62f9ab515fa04354..af8cb1c3dbd22d23b7590c738ae0f768acd292e1 100644 GIT binary patch delta 1560 zcmc&!O=uHA6z=SXb~Bo0ch*J`!K94^wK<3uJeeN-0Z~E3K#h~lBw4aQadz9%Q>9>& z9z2Ax1TR9tlO7t#VJ}uts|OWPsAqeSP)|;EnCKmDFrRlpo_`Wyq8{V657Pj}V zRzmf0W8?*ZQU+715}Hs{dp13TH4U8*L^K-g^Wq0vF;5EHNpY=G-3qYSlcDSNedxG= z&@sQFZ=%Iuistc3sQ8_3P&Bdu{sEU=Qq=Z!_RW7pc3#mVi3)sl2UZ2*<#`*GFAl`tXc4rIE z=&Gi9J<(!=>5IYs8MPzRc)b`}kG}*E6;#VMsj7HZYdOu@lV|2E-2$oGa~70!Y@~IZ zB?+Quuu;^BVWWs^e$+9)XZv{}x;fzDQWtMqek;(zhup6~^6Q26SI~y#f51?Ok}vA~ zdJf)&=X4k{usubwmQXY`m)m9iWgbdhJri5b`Umg;%u$FsD8bY&q+8?I<*VG~;Gi$+ zSRX<2NWW$(MI_d)egSfMWfM3no1A%;+u~}`7@y~pf>>LQ@#hXCcWeSph>hm^Z-E*f f<`XW1x;r}b7bAC>=niJg`8v$M;+#{X{O6(HJ{^ri delta 1047 zcmdnn!Q1wOXM<^;@?l0U!KB2ZqRiAH-Q>)Y%J}lcoE#x74gn!G&NMK1Hu+zHHpd5h zfg>FgU$ION&|?-A-@px2A_Q0R4O3DWyX53=c{3RIPwvkbXQzef-UU;Dravg4jp=g= z4>O*aoKU1d3%74pEndtdw~vvF2NoT)jfu@IW&Zq=`P;WlR_chI{J0}(^UTgujFb0t zZ{B>ohxdxg5k@YdjLhPa{G!ZcaLNEVrj;2DTf%Z@^4>piE#DF4z=~7|9)G5lz00trs0vjG2V3cA|*vN0eIDM%Wvz=ZT zhag;D%0b|G-&`iBypRx7n~;OR=4WRvGAeB1pIq1=F@1_Qv!I?(C@@XK3|2tZC-DvRGwI=o0FfMEhGc=4000000" + } + element { + scale: 10 + area { + color: 8738 + priority: -15030 + } + apply_if: "bbox_area<4000000" + } + element { + scale: 11 + area { + color: 8738 + priority: -15030 + } + caption { + primary { + height: 9 + color: 19033 + } + priority: 15970 + } + apply_if: "bbox_area>=4000000" + } + element { + scale: 11 + area { + color: 8738 + priority: -15030 + } + apply_if: "bbox_area<4000000" + } + element { + scale: 12 + area { + color: 8738 + priority: -15030 + } + caption { + primary { + height: 9 + color: 19033 + } + priority: 15970 + } + apply_if: "bbox_area>=4000000" + } + element { + scale: 12 + area { + color: 8738 + priority: -15030 + } + apply_if: "bbox_area<4000000" + } + element { + scale: 13 + area { + color: 8738 + priority: -15030 + } + caption { + primary { + height: 9 + color: 19033 + } + priority: 15970 + } + apply_if: "bbox_area>=4000000" + } + element { + scale: 13 + area { + color: 8738 + priority: -15030 + } + apply_if: "bbox_area<4000000" + } + element { + scale: 14 + area { + color: 8738 + priority: -15030 + } + caption { + primary { + height: 10 + color: 19033 + } + priority: 15970 + } + apply_if: "bbox_area>=4000000" + } + element { + scale: 14 + area { + color: 8738 + priority: -15030 + } + caption { + primary { + height: 10 + color: 19033 + } + priority: 15970 + } + apply_if: "bbox_area<4000000" + } + element { + scale: 15 + area { + color: 8738 + priority: -15030 + } + caption { + primary { + height: 10 + color: 19033 + } + priority: 15970 + } + apply_if: "bbox_area>=4000000" + } + element { + scale: 15 + area { + color: 8738 + priority: -15030 + } + caption { + primary { + height: 10 + color: 19033 + } + priority: 15970 + } + apply_if: "bbox_area<4000000" + } + element { + scale: 16 + area { + color: 8738 + priority: -15030 + } + caption { + primary { + height: 11 + color: 19033 + } + priority: 15970 + } + apply_if: "bbox_area>=4000000" + } + element { + scale: 16 + area { + color: 8738 + priority: -15030 + } + caption { + primary { + height: 11 + color: 19033 + } + priority: 15970 + } + apply_if: "bbox_area<4000000" + } + element { + scale: 17 + area { + color: 8738 + priority: -15030 + } + caption { + primary { + height: 11 + color: 19033 + } + priority: 15970 + } + apply_if: "bbox_area>=4000000" + } + element { + scale: 17 + area { + color: 8738 + priority: -15030 + } + caption { + primary { + height: 11 + color: 19033 + } + priority: 15970 + } + apply_if: "bbox_area<4000000" + } + element { + scale: 18 + area { + color: 8738 + priority: -15030 + } + caption { + primary { + height: 11 + color: 19033 + } + priority: 15970 + } + apply_if: "bbox_area>=4000000" + } + element { + scale: 18 + area { + color: 8738 + priority: -15030 + } + caption { + primary { + height: 11 + color: 19033 + } + priority: 15970 + } + apply_if: "bbox_area<4000000" + } + element { + scale: 19 + area { + color: 8738 + priority: -15030 + } + caption { + primary { + height: 11 + color: 19033 + } + priority: 15970 + } + apply_if: "bbox_area>=4000000" + } + element { + scale: 19 + area { + color: 8738 + priority: -15030 + } + caption { + primary { + height: 11 + color: 19033 + } + priority: 15970 + } + apply_if: "bbox_area<4000000" + } +} cont { name: "natural-water-pond" element { @@ -68033,14 +68775,6 @@ cont { } element { scale: 16 - lines { - width: 5.0 - color: 3158064 - dashdot { - } - priority: 1969 - cap: BUTTCAP - } lines { width: 3.0 color: 1295201075 @@ -68064,17 +68798,9 @@ cont { } element { scale: 17 - lines { - width: 6.5 - color: 4671303 - dashdot { - } - priority: 1969 - cap: BUTTCAP - } lines { width: 4.5 - color: 439563059 + color: 1295201075 priority: 1970 } area { @@ -68095,17 +68821,9 @@ cont { } element { scale: 18 - lines { - width: 8.0 - color: 4671303 - dashdot { - } - priority: 1969 - cap: BUTTCAP - } lines { width: 6.0 - color: 3355443 + color: 1295201075 priority: 1970 } area { @@ -68126,17 +68844,9 @@ cont { } element { scale: 19 - lines { - width: 10.0 - color: 4671303 - dashdot { - } - priority: 1969 - cap: BUTTCAP - } lines { width: 8.0 - color: 3355443 + color: 1295201075 priority: 1970 } area { @@ -68376,41 +69086,6 @@ cont { } } } -cont { - name: "waterway-lock" - element { - scale: 16 - lines { - width: 1.5 - color: 401446 - priority: -15600 - } - } - element { - scale: 17 - lines { - width: 1.5 - color: 401446 - priority: -15600 - } - } - element { - scale: 18 - lines { - width: 1.5 - color: 401446 - priority: -15600 - } - } - element { - scale: 19 - lines { - width: 1.5 - color: 401446 - priority: -15600 - } - } -} cont { name: "waterway-lock_gate" element { diff --git a/data/drules_proto_vehicle_clear.bin b/data/drules_proto_vehicle_clear.bin index 89064a12d9eed17ff510f303e14cec03e9e10551..196c3461db39e32e40f8fcca1eab06f3bbd8d13b 100644 GIT binary patch delta 1558 zcmdmalHj0YzN7)bLmfWZfQftj11wQx+nXdqQDD5S;-5&i)de#0Uq#3cX` zVQ_%a3J17BsXEtQMlRl@#G<0i)FR!q)V$OAHpYMX4o;nR%Ic>G9=>IXQzij5h}vdoZf* zVdUb0Iec(CH_9|-iuNH!E}@Lf;*$KL%w*l<%#uown~Mi;7;imUV^d$uC7hd>7oVG$ zlB%1Uo0OQBotv6hA|wXPd_vG%4$FKBFW7w*MqEmmu7}{KVqzb9or|FxD4w z3Bg2D6N^eR;z7YdW2YQv=HiE1x;=%DQB0O4CqFrR`$i|m#q879D>DjhuhM3m`b4Oo ziHoN^u_U#qJh4(YB{5gXc=}x_CW+|*0!%W@h8zOZ+XR>l7!9ZMOEZa0p9K*Vnl2>> W7PN;7N^hSm$n=qE`$rL`6Z`jE5%&7)bM`fx$C-fd(L$+-R!G@d3-1W2TLEsDUdpC=j zxHB^Dn;d5q++rRTMo?+Z>F36}TyIs(Xaq1K8CT1?4 z^2CzVqVmK_-IT;!AukSoAyG~SFc5GMIJNvTn-qgW2fqd5^j%U+Mp7QY2!Y9qpvrGh zVG^01Da|CK;=v&ZS0sg^NJt23w$Su=X(lzGaYAsF3MeY4KY$qrR3r>nq=KSodxtcW z0&{&f7cblsIr+)iLZU!d3PNrAVK1=%;VnjmPN2tt?!qc8gk4w|i!fIVmk^3&@#))l J$uVu?2LO5p=zahI diff --git a/data/drules_proto_vehicle_clear.txt b/data/drules_proto_vehicle_clear.txt index 8ed81410f0..cd30994ef7 100644 --- a/data/drules_proto_vehicle_clear.txt +++ b/data/drules_proto_vehicle_clear.txt @@ -4077,8 +4077,8 @@ cont { element { scale: 16 lines { - width: 0.7 - color: 2147483648 + width: 1.0 + color: 2157549977 dashdot { dd: 1.0 dd: 1.0 @@ -4089,11 +4089,11 @@ cont { element { scale: 17 lines { - width: 1.0 - color: 1291845632 + width: 1.5 + color: 1301911961 dashdot { - dd: 1.0 - dd: 1.0 + dd: 2.0 + dd: 2.0 } priority: 1505 } @@ -4101,11 +4101,11 @@ cont { element { scale: 18 lines { - width: 1.4 - color: 1291845632 + width: 2.0 + color: 10066329 dashdot { - dd: 1.0 - dd: 1.0 + dd: 2.4 + dd: 2.4 } priority: 1505 } @@ -4113,11 +4113,11 @@ cont { element { scale: 19 lines { - width: 1.4 - color: 1291845632 + width: 2.0 + color: 10066329 dashdot { - dd: 1.0 - dd: 1.0 + dd: 2.4 + dd: 2.4 } priority: 1505 } @@ -4128,8 +4128,8 @@ cont { element { scale: 16 lines { - width: 0.7 - color: 2147483648 + width: 1.0 + color: 2157549977 dashdot { dd: 1.0 dd: 1.0 @@ -4140,11 +4140,11 @@ cont { element { scale: 17 lines { - width: 1.0 - color: 1291845632 + width: 1.5 + color: 1301911961 dashdot { - dd: 1.0 - dd: 1.0 + dd: 2.0 + dd: 2.0 } priority: 1505 } @@ -4152,11 +4152,11 @@ cont { element { scale: 18 lines { - width: 1.4 - color: 1291845632 + width: 2.0 + color: 10066329 dashdot { - dd: 1.0 - dd: 1.0 + dd: 2.4 + dd: 2.4 } priority: 1505 } @@ -4164,11 +4164,11 @@ cont { element { scale: 19 lines { - width: 1.4 - color: 1291845632 + width: 2.0 + color: 10066329 dashdot { - dd: 1.0 - dd: 1.0 + dd: 2.4 + dd: 2.4 } priority: 1505 } @@ -4179,8 +4179,8 @@ cont { element { scale: 16 lines { - width: 0.7 - color: 2147483648 + width: 1.0 + color: 2157549977 dashdot { dd: 1.0 dd: 1.0 @@ -4191,11 +4191,11 @@ cont { element { scale: 17 lines { - width: 1.0 - color: 1291845632 + width: 1.5 + color: 1301911961 dashdot { - dd: 1.0 - dd: 1.0 + dd: 2.0 + dd: 2.0 } priority: 1505 } @@ -4203,11 +4203,11 @@ cont { element { scale: 18 lines { - width: 1.4 - color: 1291845632 + width: 2.0 + color: 10066329 dashdot { - dd: 1.0 - dd: 1.0 + dd: 2.4 + dd: 2.4 } priority: 1505 } @@ -4215,11 +4215,11 @@ cont { element { scale: 19 lines { - width: 1.4 - color: 1291845632 + width: 2.0 + color: 10066329 dashdot { - dd: 1.0 - dd: 1.0 + dd: 2.4 + dd: 2.4 } priority: 1505 } @@ -4292,6 +4292,57 @@ cont { } } } +cont { + name: "barrier-retaining_wall" + element { + scale: 16 + lines { + width: 1.0 + color: 2157549977 + dashdot { + dd: 1.0 + dd: 1.0 + } + priority: 1505 + } + } + element { + scale: 17 + lines { + width: 1.5 + color: 1301911961 + dashdot { + dd: 2.0 + dd: 2.0 + } + priority: 1505 + } + } + element { + scale: 18 + lines { + width: 2.0 + color: 10066329 + dashdot { + dd: 2.4 + dd: 2.4 + } + priority: 1505 + } + } + element { + scale: 19 + lines { + width: 2.0 + color: 10066329 + dashdot { + dd: 2.4 + dd: 2.4 + } + priority: 1505 + } + } +} cont { name: "barrier-toll_booth" element { @@ -4412,8 +4463,8 @@ cont { element { scale: 16 lines { - width: 0.7 - color: 2147483648 + width: 1.0 + color: 2157549977 dashdot { dd: 1.0 dd: 1.0 @@ -4424,11 +4475,11 @@ cont { element { scale: 17 lines { - width: 1.0 - color: 1291845632 + width: 1.5 + color: 1301911961 dashdot { - dd: 1.0 - dd: 1.0 + dd: 2.0 + dd: 2.0 } priority: 1505 } @@ -4436,11 +4487,11 @@ cont { element { scale: 18 lines { - width: 1.4 - color: 1291845632 + width: 2.0 + color: 10066329 dashdot { - dd: 1.0 - dd: 1.0 + dd: 2.4 + dd: 2.4 } priority: 1505 } @@ -4448,11 +4499,11 @@ cont { element { scale: 19 lines { - width: 1.4 - color: 1291845632 + width: 2.0 + color: 10066329 dashdot { - dd: 1.0 - dd: 1.0 + dd: 2.4 + dd: 2.4 } priority: 1505 } @@ -17493,6 +17544,57 @@ cont { } } } +cont { + name: "historic-citywalls" + element { + scale: 16 + lines { + width: 1.0 + color: 2157549977 + dashdot { + dd: 1.0 + dd: 1.0 + } + priority: 1505 + } + } + element { + scale: 17 + lines { + width: 1.5 + color: 1301911961 + dashdot { + dd: 2.0 + dd: 2.0 + } + priority: 1505 + } + } + element { + scale: 18 + lines { + width: 2.0 + color: 10066329 + dashdot { + dd: 2.4 + dd: 2.4 + } + priority: 1505 + } + } + element { + scale: 19 + lines { + width: 2.0 + color: 10066329 + dashdot { + dd: 2.4 + dd: 2.4 + } + priority: 1505 + } + } +} cont { name: "historic-fort" element { @@ -22320,6 +22422,41 @@ cont { } } } +cont { + name: "man_made-embankment" + element { + scale: 16 + lines { + width: 1.0 + color: 2157549977 + priority: 1000 + } + } + element { + scale: 17 + lines { + width: 2.0 + color: 1301911961 + priority: 1000 + } + } + element { + scale: 18 + lines { + width: 3.0 + color: 10066329 + priority: 1000 + } + } + element { + scale: 19 + lines { + width: 3.0 + color: 10066329 + priority: 1000 + } + } +} cont { name: "man_made-pier" element { @@ -22907,6 +23044,41 @@ cont { } } } +cont { + name: "natural-cliff" + element { + scale: 16 + lines { + width: 1.0 + color: 2157549977 + priority: 1000 + } + } + element { + scale: 17 + lines { + width: 2.0 + color: 1301911961 + priority: 1000 + } + } + element { + scale: 18 + lines { + width: 3.0 + color: 10066329 + priority: 1000 + } + } + element { + scale: 19 + lines { + width: 3.0 + color: 10066329 + priority: 1000 + } + } +} cont { name: "natural-coastline" element { @@ -23049,6 +23221,41 @@ cont { } } } +cont { + name: "natural-earth_bank" + element { + scale: 16 + lines { + width: 1.0 + color: 2157549977 + priority: 1000 + } + } + element { + scale: 17 + lines { + width: 2.0 + color: 1301911961 + priority: 1000 + } + } + element { + scale: 18 + lines { + width: 3.0 + color: 10066329 + priority: 1000 + } + } + element { + scale: 19 + lines { + width: 3.0 + color: 10066329 + priority: 1000 + } + } +} cont { name: "natural-glacier" element { @@ -24957,6 +25164,478 @@ cont { apply_if: "bbox_area>=1000000" } } +cont { + name: "natural-water-lock" + element { + area { + color: 9163744 + priority: -15071 + } + } + element { + scale: 1 + area { + color: 9163744 + priority: -15071 + } + } + element { + scale: 2 + area { + color: 9163744 + priority: -15071 + } + } + element { + scale: 3 + area { + color: 9163744 + priority: -15071 + } + } + element { + scale: 4 + area { + color: 9163744 + priority: -15071 + } + } + element { + scale: 5 + area { + color: 9163744 + priority: -15071 + } + } + element { + scale: 6 + area { + color: 9163744 + priority: -15071 + } + } + element { + scale: 7 + area { + color: 9163744 + priority: -15071 + } + } + element { + scale: 8 + area { + color: 9163744 + priority: -15071 + } + } + element { + scale: 9 + area { + color: 9163744 + priority: -15071 + } + } + element { + scale: 10 + area { + color: 9163744 + priority: -15071 + } + caption { + primary { + height: 10 + color: 4495803 + } + priority: 15929 + } + apply_if: "bbox_area>=80000000" + } + element { + scale: 10 + area { + color: 9163744 + priority: -15071 + } + apply_if: "bbox_area>=4000000" + } + element { + scale: 10 + area { + color: 9163744 + priority: -15071 + } + apply_if: "bbox_area<4000000" + } + element { + scale: 11 + area { + color: 9163744 + priority: -15071 + } + caption { + primary { + height: 10 + color: 4495803 + } + priority: 15929 + } + apply_if: "bbox_area>=80000000" + } + element { + scale: 11 + area { + color: 9163744 + priority: -15071 + } + apply_if: "bbox_area>=4000000" + } + element { + scale: 11 + area { + color: 9163744 + priority: -15071 + } + apply_if: "bbox_area<4000000" + } + element { + scale: 12 + area { + color: 9163744 + priority: -15071 + } + caption { + primary { + height: 10 + color: 4495803 + } + priority: 15929 + } + apply_if: "bbox_area>=80000000" + } + element { + scale: 12 + area { + color: 9163744 + priority: -15071 + } + apply_if: "bbox_area>=4000000" + } + element { + scale: 12 + area { + color: 9163744 + priority: -15071 + } + apply_if: "bbox_area<4000000" + } + element { + scale: 13 + area { + color: 9163744 + priority: -15071 + } + caption { + primary { + height: 10 + color: 4495803 + } + priority: 15929 + } + apply_if: "bbox_area>=80000000" + } + element { + scale: 13 + area { + color: 9163744 + priority: -15071 + } + apply_if: "bbox_area>=4000000" + } + element { + scale: 13 + area { + color: 9163744 + priority: -15071 + } + apply_if: "bbox_area<4000000" + } + element { + scale: 14 + area { + color: 9163744 + priority: -15071 + } + caption { + primary { + height: 9 + color: 4495803 + } + priority: 15929 + } + apply_if: "bbox_area>=80000000" + } + element { + scale: 14 + area { + color: 9163744 + priority: -15071 + } + apply_if: "bbox_area>=4000000" + } + element { + scale: 14 + area { + color: 9163744 + priority: -15071 + } + apply_if: "bbox_area<4000000" + } + element { + scale: 14 + area { + color: 9163744 + priority: -15071 + } + caption { + primary { + height: 9 + color: 4495803 + } + priority: 15929 + } + apply_if: "bbox_area>=1000000" + } + element { + scale: 15 + area { + color: 9163744 + priority: -15071 + } + caption { + primary { + height: 9 + color: 4495803 + } + priority: 15929 + } + apply_if: "bbox_area>=80000000" + } + element { + scale: 15 + area { + color: 9163744 + priority: -15071 + } + apply_if: "bbox_area>=4000000" + } + element { + scale: 15 + area { + color: 9163744 + priority: -15071 + } + apply_if: "bbox_area<4000000" + } + element { + scale: 15 + area { + color: 9163744 + priority: -15071 + } + caption { + primary { + height: 9 + color: 4495803 + } + priority: 15929 + } + apply_if: "bbox_area>=1000000" + } + element { + scale: 16 + area { + color: 9163744 + priority: -15071 + } + caption { + primary { + height: 10 + color: 4495803 + } + priority: 15929 + } + apply_if: "bbox_area>=80000000" + } + element { + scale: 16 + area { + color: 9163744 + priority: -15071 + } + apply_if: "bbox_area>=4000000" + } + element { + scale: 16 + area { + color: 9163744 + priority: -15071 + } + apply_if: "bbox_area<4000000" + } + element { + scale: 16 + area { + color: 9163744 + priority: -15071 + } + caption { + primary { + height: 10 + color: 4495803 + } + priority: 15929 + } + apply_if: "bbox_area>=1000000" + } + element { + scale: 17 + area { + color: 9163744 + priority: -15071 + } + caption { + primary { + height: 10 + color: 4495803 + } + priority: 15929 + } + apply_if: "bbox_area>=80000000" + } + element { + scale: 17 + area { + color: 9163744 + priority: -15071 + } + apply_if: "bbox_area>=4000000" + } + element { + scale: 17 + area { + color: 9163744 + priority: -15071 + } + apply_if: "bbox_area<4000000" + } + element { + scale: 17 + area { + color: 9163744 + priority: -15071 + } + caption { + primary { + height: 10 + color: 4495803 + } + priority: 15929 + } + apply_if: "bbox_area>=1000000" + } + element { + scale: 18 + area { + color: 9163744 + priority: -15071 + } + caption { + primary { + height: 10 + color: 4495803 + } + priority: 15929 + } + apply_if: "bbox_area>=80000000" + } + element { + scale: 18 + area { + color: 9163744 + priority: -15071 + } + apply_if: "bbox_area>=4000000" + } + element { + scale: 18 + area { + color: 9163744 + priority: -15071 + } + apply_if: "bbox_area<4000000" + } + element { + scale: 18 + area { + color: 9163744 + priority: -15071 + } + caption { + primary { + height: 10 + color: 4495803 + } + priority: 15929 + } + apply_if: "bbox_area>=1000000" + } + element { + scale: 19 + area { + color: 9163744 + priority: -15071 + } + caption { + primary { + height: 10 + color: 4495803 + } + priority: 15929 + } + apply_if: "bbox_area>=80000000" + } + element { + scale: 19 + area { + color: 9163744 + priority: -15071 + } + apply_if: "bbox_area>=4000000" + } + element { + scale: 19 + area { + color: 9163744 + priority: -15071 + } + apply_if: "bbox_area<4000000" + } + element { + scale: 19 + area { + color: 9163744 + priority: -15071 + } + caption { + primary { + height: 10 + color: 4495803 + } + priority: 15929 + } + apply_if: "bbox_area>=1000000" + } +} cont { name: "natural-water-pond" element { @@ -42432,14 +43111,6 @@ cont { name: "waterway-dam" element { scale: 15 - lines { - width: 4.0 - color: 13947850 - dashdot { - } - priority: 1928 - cap: BUTTCAP - } lines { width: 2.0 color: 2160576191 @@ -42457,14 +43128,6 @@ cont { } element { scale: 16 - lines { - width: 5.0 - color: 13947850 - dashdot { - } - priority: 1928 - cap: BUTTCAP - } lines { width: 3.0 color: 2160576191 @@ -42481,14 +43144,6 @@ cont { } element { scale: 17 - lines { - width: 6.5 - color: 13947850 - dashdot { - } - priority: 1928 - cap: BUTTCAP - } lines { width: 4.5 color: 2160576191 @@ -42505,14 +43160,6 @@ cont { } element { scale: 18 - lines { - width: 8.0 - color: 13947850 - dashdot { - } - priority: 1928 - cap: BUTTCAP - } lines { width: 6.0 color: 2160576191 @@ -42529,14 +43176,6 @@ cont { } element { scale: 19 - lines { - width: 10.0 - color: 13947850 - dashdot { - } - priority: 1928 - cap: BUTTCAP - } lines { width: 8.0 color: 2160576191 @@ -42772,41 +43411,6 @@ cont { } } } -cont { - name: "waterway-lock" - element { - scale: 16 - lines { - width: 1.5 - color: 3584191 - priority: 1929 - } - } - element { - scale: 17 - lines { - width: 1.5 - color: 3584191 - priority: 1929 - } - } - element { - scale: 18 - lines { - width: 1.5 - color: 3584191 - priority: 1929 - } - } - element { - scale: 19 - lines { - width: 1.5 - color: 3584191 - priority: 1929 - } - } -} cont { name: "waterway-lock_gate" element { diff --git a/data/drules_proto_vehicle_dark.bin b/data/drules_proto_vehicle_dark.bin index e3cd818115127c97e3cc81e91826dc9952bfdb1a..618d5e691654464fd3a2155a57ee3a0b60118e17 100644 GIT binary patch delta 1515 zcmX?nkYoB4jtwvM84pf=r7z9L00tlI1&(w~Y~q;AXec%Ly#ZJK53s;17AYYv0f-U? z2NhQS~S!0n7&f{*~TG1{nqjFC$W%mX^PD77RpGcPkQJ-$3KCucCa z{Rk765ZJYwzZuyvs_tRr;(ig++92v!@84+ix=$D&8Fv`Th$kH3Fju}#pfobr0S;TCMD)&=ceYB2#Em`xDZ+b zS9rk=6c>bxGdO@U|0@=dxG1nt5QM7d0E;t0goUvPb4>%f0b=WRHBLq!w!B;}-n_(; z(xSv1-Q=9iv^3h6dtz44Dl$1g6XIGU)>u cg40tV458_3APnK{UwD~5GHv%0WGdwc05e2RGXMYp delta 764 zcmbP!h2!u+jtwvM84pi>r7z8w1_saU1sZ^WV|s!VljvmK^ZXniz#=bLz#`%gxrMYi zgoM;MANVwSV$D19AFTlxIkDizaIs?cKb=*qu>zA0rn}Qesh2W@?dc zd16iuFo*=;p+K_`-Mrb;qs3Psu%A}s`$RzQ)ihe!*=1000000" } } +cont { + name: "natural-water-lock" + element { + area { + color: 8738 + priority: -15071 + } + } + element { + scale: 1 + area { + color: 8738 + priority: -15071 + } + } + element { + scale: 2 + area { + color: 8738 + priority: -15071 + } + } + element { + scale: 3 + area { + color: 8738 + priority: -15071 + } + } + element { + scale: 4 + area { + color: 8738 + priority: -15071 + } + } + element { + scale: 5 + area { + color: 8738 + priority: -15071 + } + } + element { + scale: 6 + area { + color: 8738 + priority: -15071 + } + } + element { + scale: 7 + area { + color: 8738 + priority: -15071 + } + } + element { + scale: 8 + area { + color: 8738 + priority: -15071 + } + } + element { + scale: 9 + area { + color: 8738 + priority: -15071 + } + } + element { + scale: 10 + area { + color: 8738 + priority: -15071 + } + caption { + primary { + height: 10 + color: 19033 + } + priority: 15929 + } + apply_if: "bbox_area>=80000000" + } + element { + scale: 10 + area { + color: 8738 + priority: -15071 + } + apply_if: "bbox_area>=4000000" + } + element { + scale: 10 + area { + color: 8738 + priority: -15071 + } + apply_if: "bbox_area<4000000" + } + element { + scale: 11 + area { + color: 8738 + priority: -15071 + } + caption { + primary { + height: 10 + color: 19033 + } + priority: 15929 + } + apply_if: "bbox_area>=80000000" + } + element { + scale: 11 + area { + color: 8738 + priority: -15071 + } + apply_if: "bbox_area>=4000000" + } + element { + scale: 11 + area { + color: 8738 + priority: -15071 + } + apply_if: "bbox_area<4000000" + } + element { + scale: 12 + area { + color: 8738 + priority: -15071 + } + caption { + primary { + height: 10 + color: 19033 + } + priority: 15929 + } + apply_if: "bbox_area>=80000000" + } + element { + scale: 12 + area { + color: 8738 + priority: -15071 + } + apply_if: "bbox_area>=4000000" + } + element { + scale: 12 + area { + color: 8738 + priority: -15071 + } + apply_if: "bbox_area<4000000" + } + element { + scale: 13 + area { + color: 8738 + priority: -15071 + } + caption { + primary { + height: 10 + color: 19033 + } + priority: 15929 + } + apply_if: "bbox_area>=80000000" + } + element { + scale: 13 + area { + color: 8738 + priority: -15071 + } + apply_if: "bbox_area>=4000000" + } + element { + scale: 13 + area { + color: 8738 + priority: -15071 + } + apply_if: "bbox_area<4000000" + } + element { + scale: 14 + area { + color: 8738 + priority: -15071 + } + caption { + primary { + height: 9 + color: 19033 + } + priority: 15929 + } + apply_if: "bbox_area>=80000000" + } + element { + scale: 14 + area { + color: 8738 + priority: -15071 + } + apply_if: "bbox_area>=4000000" + } + element { + scale: 14 + area { + color: 8738 + priority: -15071 + } + apply_if: "bbox_area<4000000" + } + element { + scale: 14 + area { + color: 8738 + priority: -15071 + } + caption { + primary { + height: 9 + color: 19033 + } + priority: 15929 + } + apply_if: "bbox_area>=1000000" + } + element { + scale: 15 + area { + color: 8738 + priority: -15071 + } + caption { + primary { + height: 9 + color: 19033 + } + priority: 15929 + } + apply_if: "bbox_area>=80000000" + } + element { + scale: 15 + area { + color: 8738 + priority: -15071 + } + apply_if: "bbox_area>=4000000" + } + element { + scale: 15 + area { + color: 8738 + priority: -15071 + } + apply_if: "bbox_area<4000000" + } + element { + scale: 15 + area { + color: 8738 + priority: -15071 + } + caption { + primary { + height: 9 + color: 19033 + } + priority: 15929 + } + apply_if: "bbox_area>=1000000" + } + element { + scale: 16 + area { + color: 8738 + priority: -15071 + } + caption { + primary { + height: 10 + color: 19033 + } + priority: 15929 + } + apply_if: "bbox_area>=80000000" + } + element { + scale: 16 + area { + color: 8738 + priority: -15071 + } + apply_if: "bbox_area>=4000000" + } + element { + scale: 16 + area { + color: 8738 + priority: -15071 + } + apply_if: "bbox_area<4000000" + } + element { + scale: 16 + area { + color: 8738 + priority: -15071 + } + caption { + primary { + height: 10 + color: 19033 + } + priority: 15929 + } + apply_if: "bbox_area>=1000000" + } + element { + scale: 17 + area { + color: 8738 + priority: -15071 + } + caption { + primary { + height: 10 + color: 19033 + } + priority: 15929 + } + apply_if: "bbox_area>=80000000" + } + element { + scale: 17 + area { + color: 8738 + priority: -15071 + } + apply_if: "bbox_area>=4000000" + } + element { + scale: 17 + area { + color: 8738 + priority: -15071 + } + apply_if: "bbox_area<4000000" + } + element { + scale: 17 + area { + color: 8738 + priority: -15071 + } + caption { + primary { + height: 10 + color: 19033 + } + priority: 15929 + } + apply_if: "bbox_area>=1000000" + } + element { + scale: 18 + area { + color: 8738 + priority: -15071 + } + caption { + primary { + height: 10 + color: 19033 + } + priority: 15929 + } + apply_if: "bbox_area>=80000000" + } + element { + scale: 18 + area { + color: 8738 + priority: -15071 + } + apply_if: "bbox_area>=4000000" + } + element { + scale: 18 + area { + color: 8738 + priority: -15071 + } + apply_if: "bbox_area<4000000" + } + element { + scale: 18 + area { + color: 8738 + priority: -15071 + } + caption { + primary { + height: 10 + color: 19033 + } + priority: 15929 + } + apply_if: "bbox_area>=1000000" + } + element { + scale: 19 + area { + color: 8738 + priority: -15071 + } + caption { + primary { + height: 10 + color: 19033 + } + priority: 15929 + } + apply_if: "bbox_area>=80000000" + } + element { + scale: 19 + area { + color: 8738 + priority: -15071 + } + apply_if: "bbox_area>=4000000" + } + element { + scale: 19 + area { + color: 8738 + priority: -15071 + } + apply_if: "bbox_area<4000000" + } + element { + scale: 19 + area { + color: 8738 + priority: -15071 + } + caption { + primary { + height: 10 + color: 19033 + } + priority: 15929 + } + apply_if: "bbox_area>=1000000" + } +} cont { name: "natural-water-pond" element { @@ -42756,14 +43435,6 @@ cont { name: "waterway-dam" element { scale: 15 - lines { - width: 4.0 - color: 1842204 - dashdot { - } - priority: 1928 - cap: BUTTCAP - } lines { width: 2.0 color: 2149128473 @@ -42781,14 +43452,6 @@ cont { } element { scale: 16 - lines { - width: 5.0 - color: 1842204 - dashdot { - } - priority: 1928 - cap: BUTTCAP - } lines { width: 3.0 color: 2149128473 @@ -42805,14 +43468,6 @@ cont { } element { scale: 17 - lines { - width: 6.5 - color: 1842204 - dashdot { - } - priority: 1928 - cap: BUTTCAP - } lines { width: 4.5 color: 2149128473 @@ -42829,14 +43484,6 @@ cont { } element { scale: 18 - lines { - width: 8.0 - color: 1842204 - dashdot { - } - priority: 1928 - cap: BUTTCAP - } lines { width: 6.0 color: 2149128473 @@ -42853,14 +43500,6 @@ cont { } element { scale: 19 - lines { - width: 10.0 - color: 1842204 - dashdot { - } - priority: 1928 - cap: BUTTCAP - } lines { width: 8.0 color: 2149128473 @@ -43096,41 +43735,6 @@ cont { } } } -cont { - name: "waterway-lock" - element { - scale: 16 - lines { - width: 1.5 - color: 401446 - priority: 1929 - } - } - element { - scale: 17 - lines { - width: 1.5 - color: 401446 - priority: 1929 - } - } - element { - scale: 18 - lines { - width: 1.5 - color: 401446 - priority: 1929 - } - } - element { - scale: 19 - lines { - width: 1.5 - color: 401446 - priority: 1929 - } - } -} cont { name: "waterway-lock_gate" element { diff --git a/data/patterns.txt b/data/patterns.txt index db9bb3a875..38129ae965 100644 --- a/data/patterns.txt +++ b/data/patterns.txt @@ -1,5 +1,7 @@ 1.0 18.0 1.0 1.0 +2.0 2.0 +2.4 2.4 1.35 1.0 1.8 1.0 1.44 1.44 @@ -11,7 +13,6 @@ 10.8 4.5 13.5 5.4 18.0 6.2 -2.0 2.0 2.0 1.0 3.6 1.6 5.0 2.2 diff --git a/data/types.txt b/data/types.txt index 2b1170d6f2..31a9c1e73c 100644 --- a/data/types.txt +++ b/data/types.txt @@ -465,7 +465,7 @@ mapswithme mapswithme *piste:type|downhill|expert *landuse|salt_pond -mapswithme +*cemetery|grave *railway|monorail|bridge *area:highway|steps mapswithme @@ -495,8 +495,8 @@ mapswithme *amenity|parking|park_and_ride mapswithme mapswithme -mapswithme -*waterway|lock +*natural|water|lock +waterway|canal mapswithme mapswithme mapswithme @@ -948,14 +948,14 @@ mapswithme *office|estate_agent *office|lawyer *office -mapswithme -mapswithme +*natural|earth_bank +*man_made|embankment *amenity|ferry_terminal *amenity *shop|furniture -mapswithme +*craft|winery *waterway|waterfall -mapswithme +*craft|electronics_repair mapswithme *amenity|casino *amenity|brothel @@ -985,7 +985,7 @@ mapswithme *internet_access|wlan *amenity|waste_disposal *amenity|bbq -mapswithme +*craft|sawmill route|ferry *junction|roundabout *highway|speed_camera @@ -1058,16 +1058,16 @@ route|ferry *shop|travel_agency *highway|elevator *shop|outdoor -mapswithme -mapswithme +*craft|confectionery +*craft|handicraft *shop|dry_cleaning *shop|tyres -mapswithme +*craft|beekeeper *amenity|car_wash *amenity|veterinary *amenity|charging_station *amenity|childcare -mapswithme +*craft|blacksmith *amenity|bicycle_parking *amenity|community_centre *amenity|courthouse diff --git a/data/visibility.txt b/data/visibility.txt index ed0dac1335..42b4f6300d 100644 --- a/data/visibility.txt +++ b/data/visibility.txt @@ -163,7 +163,7 @@ world 00000000000000000000 + gate 00000000000000000000 - hedge 00000000000000001111 - lift_gate 00000000000000001111 - - retaining_wall 00000000000000000000 - + retaining_wall 00000000000000001111 - stile 00000000000000000000 - swing_gate 00000000000000000000 - toll_booth 00000000000011111111 - @@ -199,19 +199,29 @@ world 00000000000000000000 + train_station 00000000000011111111 - {} building:part 00000000000000001111 - + cemetery 00000000000000000000 + + grave 00000000000000000000 - + {} complex_entry 00000000000000000000 - craft 00000000000000000000 + + beekeeper 00000000000000000000 - + blacksmith 00000000000000000000 - brewery 00000000000000000000 - carpenter 00000000000000000000 - + confectionery 00000000000000000000 - electrician 00000000000000000000 - + electronics_repair 00000000000000000000 - gardener 00000000000000000000 - + handicraft 00000000000000000000 - hvac 00000000000000000000 - metal_construction 00000000000000000000 - painter 00000000000000000000 - photographer 00000000000000000000 - plumber 00000000000000000000 - + sawmill 00000000000000000000 - shoemaker 00000000000000000000 - tailor 00000000000000000000 - + winery 00000000000000000000 - {} cuisine 00000000000000000000 + african 00000000000000000000 - @@ -456,7 +466,7 @@ world 00000000000000000000 + defensive 00000000000011111111 - stately 00000000000011111111 - {} - citywalls 00000000000000000000 - + citywalls 00000000000000001111 - fort 00000000000011111111 - memorial 00000000000000011111 + plaque 00000000000000011111 - @@ -578,6 +588,7 @@ world 00000000000000000000 + cairn 00000000000000000000 - chimney 00000000000000000000 - cutline 00000000000000011111 - + embankment 00000000000000001111 - flagpole 00000000000000000000 - lighthouse 00000000000000000000 - mast 00000000000000000000 - @@ -611,8 +622,9 @@ world 00000000000000000000 + {} cape 00000000000000111111 - cave_entrance 00000000000000000000 - - cliff 00000000000000000000 - + cliff 00000000000000001111 - coastline 11111111111111111111 - + earth_bank 00000000000000001111 - geyser 00000000000000000000 - glacier 11111111111111111111 - grassland 00000000000000111111 - @@ -631,6 +643,7 @@ world 00000000000000000000 + water 11111111111111111111 + basin 11111111111111111111 - lake 11111111111111111111 - + lock 11111111111111111111 - pond 11111111111111111111 - reservoir 11111111111111111111 - river 11111111111111111111 - @@ -981,7 +994,6 @@ world 00000000000000000000 + drain 00000000000000000111 + tunnel 00000000000000000000 - {} - lock 00000000000000001111 - lock_gate 00000000000000001111 - river 00000000001111111111 + tunnel 00000000000111111111 - -- 2.45.3 From b4fbe7bfb7e34a831612d3aa13527fe41aa9b9b8 Mon Sep 17 00:00:00 2001 From: Viktor Govako Date: Fri, 10 Jun 2022 09:43:33 +0300 Subject: [PATCH 8/8] [strings] Regenerated. Signed-off-by: Viktor Govako --- android/res/values-ar/strings.xml | 2 ++ android/res/values-be/strings.xml | 2 ++ android/res/values-bg/strings.xml | 2 ++ android/res/values-cs/strings.xml | 2 ++ android/res/values-da/strings.xml | 2 ++ android/res/values-de/strings.xml | 3 ++- android/res/values-el/strings.xml | 2 ++ android/res/values-es/strings.xml | 2 ++ android/res/values-eu/strings.xml | 2 ++ android/res/values-fa/strings.xml | 2 ++ android/res/values-fi/strings.xml | 2 ++ android/res/values-fr/strings.xml | 3 ++- android/res/values-hu/strings.xml | 2 ++ android/res/values-in/strings.xml | 2 ++ android/res/values-it/strings.xml | 2 ++ android/res/values-iw/strings.xml | 2 ++ android/res/values-ja/strings.xml | 2 ++ android/res/values-ko/strings.xml | 2 ++ android/res/values-nb/strings.xml | 2 ++ android/res/values-nl/strings.xml | 2 ++ android/res/values-pl/strings.xml | 2 ++ android/res/values-pt-rBR/strings.xml | 3 ++- android/res/values-pt/strings.xml | 3 ++- android/res/values-ro/strings.xml | 2 ++ android/res/values-ru/strings.xml | 10 +++++++++- android/res/values-sk/strings.xml | 2 ++ android/res/values-sv/strings.xml | 2 ++ android/res/values-sw/strings.xml | 2 ++ android/res/values-th/strings.xml | 2 ++ android/res/values-tr/strings.xml | 3 ++- android/res/values-uk/strings.xml | 3 ++- android/res/values-vi/strings.xml | 2 ++ android/res/values-zh-rTW/strings.xml | 2 ++ android/res/values-zh/strings.xml | 2 ++ android/res/values/strings.xml | 10 +++++++++- .../ar.lproj/Localizable.strings | 20 +++++++++++++++++-- .../be.lproj/Localizable.strings | 20 +++++++++++++++++-- .../bg.lproj/Localizable.strings | 20 +++++++++++++++++-- .../cs.lproj/Localizable.strings | 20 +++++++++++++++++-- .../da.lproj/Localizable.strings | 20 +++++++++++++++++-- .../de.lproj/Localizable.strings | 20 +++++++++++++++++-- .../el.lproj/Localizable.strings | 20 +++++++++++++++++-- .../en-GB.lproj/Localizable.strings | 20 +++++++++++++++++-- .../en.lproj/Localizable.strings | 20 +++++++++++++++++-- .../es-MX.lproj/Localizable.strings | 20 +++++++++++++++++-- .../es.lproj/Localizable.strings | 20 +++++++++++++++++-- .../eu.lproj/Localizable.strings | 20 +++++++++++++++++-- .../fa.lproj/Localizable.strings | 20 +++++++++++++++++-- .../fi.lproj/Localizable.strings | 20 +++++++++++++++++-- .../fr.lproj/Localizable.strings | 20 +++++++++++++++++-- .../he.lproj/Localizable.strings | 20 +++++++++++++++++-- .../hu.lproj/Localizable.strings | 20 +++++++++++++++++-- .../id.lproj/Localizable.strings | 20 +++++++++++++++++-- .../it.lproj/Localizable.strings | 20 +++++++++++++++++-- .../ja.lproj/Localizable.strings | 20 +++++++++++++++++-- .../ko.lproj/Localizable.strings | 20 +++++++++++++++++-- .../nb.lproj/Localizable.strings | 20 +++++++++++++++++-- .../nl.lproj/Localizable.strings | 20 +++++++++++++++++-- .../pl.lproj/Localizable.strings | 20 +++++++++++++++++-- .../pt-BR.lproj/Localizable.strings | 20 +++++++++++++++++-- .../pt.lproj/Localizable.strings | 20 +++++++++++++++++-- .../ro.lproj/Localizable.strings | 20 +++++++++++++++++-- .../ru.lproj/Localizable.strings | 20 +++++++++++++++++-- .../sk.lproj/Localizable.strings | 20 +++++++++++++++++-- .../sv.lproj/Localizable.strings | 20 +++++++++++++++++-- .../sw.lproj/Localizable.strings | 20 +++++++++++++++++-- .../th.lproj/Localizable.strings | 20 +++++++++++++++++-- .../tr.lproj/Localizable.strings | 20 +++++++++++++++++-- .../uk.lproj/Localizable.strings | 20 +++++++++++++++++-- .../vi.lproj/Localizable.strings | 20 +++++++++++++++++-- .../zh-Hans.lproj/Localizable.strings | 20 +++++++++++++++++-- .../zh-Hant.lproj/Localizable.strings | 20 +++++++++++++++++-- 72 files changed, 750 insertions(+), 82 deletions(-) diff --git a/android/res/values-ar/strings.xml b/android/res/values-ar/strings.xml index 8231ff2906..ff4af56212 100644 --- a/android/res/values-ar/strings.xml +++ b/android/res/values-ar/strings.xml @@ -791,6 +791,7 @@ جراج مبنى محطة سكك حديدية + ﺮﻴﻄﺧ مصنع جعة نجار كهربائي @@ -1126,6 +1127,7 @@ كتلة جليدية ملعب بحيرة + ﻞﻔﻘﻟﺍ ﺔﻓﺮﻏ بركة خزان حوض المياه diff --git a/android/res/values-be/strings.xml b/android/res/values-be/strings.xml index 5f756cc8f5..4a07a66d82 100644 --- a/android/res/values-be/strings.xml +++ b/android/res/values-be/strings.xml @@ -747,6 +747,7 @@ Ланцуг Шлагбаўм Шлагбаўм + Магіла Металаканструкцыі Чай з бурбалкамі Дэфібрылятар @@ -861,6 +862,7 @@ Перавал Пяшчаны пляж Галечны пляж + Шлюзавая камера Сажалка Вадасховішча Рэзервуар diff --git a/android/res/values-bg/strings.xml b/android/res/values-bg/strings.xml index dbf5a1b15c..edf806eab5 100644 --- a/android/res/values-bg/strings.xml +++ b/android/res/values-bg/strings.xml @@ -639,6 +639,7 @@ Батерии + Гроб Метални конструкции Медицинска лаборатория @@ -736,6 +737,7 @@ Археологически сайт Резервоар Маса за пикник + Заключваща камера Резервоар Резервоар Воден басейн diff --git a/android/res/values-cs/strings.xml b/android/res/values-cs/strings.xml index cd7e018752..eacaa5686a 100644 --- a/android/res/values-cs/strings.xml +++ b/android/res/values-cs/strings.xml @@ -787,6 +787,7 @@ Garáž Stavba Železniční stanice + Hrob Pivovar Truhlář Elektrikář @@ -1120,6 +1121,7 @@ Ledovec Pole Jezero + Zámková komora Rybník Nádrž Vodní nádrž diff --git a/android/res/values-da/strings.xml b/android/res/values-da/strings.xml index 91bbfb87fa..0e4dba1aef 100644 --- a/android/res/values-da/strings.xml +++ b/android/res/values-da/strings.xml @@ -781,6 +781,7 @@ Bygning Bygning Togstation + Grav Bryggeri Tømrer Elektriker @@ -1111,6 +1112,7 @@ Gletsjer Mark Sø + Låsekammer Dam Reservoir Vandbassin diff --git a/android/res/values-de/strings.xml b/android/res/values-de/strings.xml index 93e7c9a990..46cd02a581 100644 --- a/android/res/values-de/strings.xml +++ b/android/res/values-de/strings.xml @@ -852,6 +852,7 @@ Gebäude Gebäude Bahnhof + Grab Brauerei Zimmermann Elektriker @@ -1249,6 +1250,7 @@ Heide Thermalquelle See + Schleusenkammer Teich Reservoir Wasserbecken @@ -1528,7 +1530,6 @@ Dock Abfluss Abfluss - Schleuse Schleusentor Fluss Fluss diff --git a/android/res/values-el/strings.xml b/android/res/values-el/strings.xml index 6c10e446a8..bd7ecf306c 100644 --- a/android/res/values-el/strings.xml +++ b/android/res/values-el/strings.xml @@ -787,6 +787,7 @@ Γκαράζ Κτίριο Σιδηροδρομικός σταθμός + Τάφος Ζυθοποιείο Ξυλουργός Ηλεκτρολόγος @@ -1123,6 +1124,7 @@ Παγετώνας Λιβάδι Λίμνη + Θάλαμος κλειδαριάς Δεξαμενή Δεξαμενή Μια λεκάνη νερού diff --git a/android/res/values-es/strings.xml b/android/res/values-es/strings.xml index 3c39865654..2138c17d82 100644 --- a/android/res/values-es/strings.xml +++ b/android/res/values-es/strings.xml @@ -865,6 +865,7 @@ Edificio Estación de tren Almacén + Tumba Fábrica de cerveza Carpintero Electricista @@ -1201,6 +1202,7 @@ Glaciar Campo Lago + Cámara de bloqueo Estanque Embalse Cuenca diff --git a/android/res/values-eu/strings.xml b/android/res/values-eu/strings.xml index bfb6ca1cd2..a9e16d11bd 100644 --- a/android/res/values-eu/strings.xml +++ b/android/res/values-eu/strings.xml @@ -848,6 +848,7 @@ Eraikin Tren geltokian Denda + Hilobia Garagardo fabrika Arotza Elektrizista teknikaria @@ -1183,6 +1184,7 @@ Glaziarra Landa Lakua + Sarraila Ganbera Urmaela Urtegia Arroa diff --git a/android/res/values-fa/strings.xml b/android/res/values-fa/strings.xml index 1a6c2afaac..96a74f9691 100644 --- a/android/res/values-fa/strings.xml +++ b/android/res/values-fa/strings.xml @@ -785,6 +785,7 @@ گاراژ ساختمان ایستگاه قطار + ﺮﺒﻗ کارخانه ابجوسازی نجار برق کار @@ -1031,6 +1032,7 @@ یخچال طبیعی کشتزار دریاچه + ﻞﻔﻗ ﻕﺎﺗﺍ تالاب مخزن حوضه آب diff --git a/android/res/values-fi/strings.xml b/android/res/values-fi/strings.xml index 17a0ac7037..f36ca6676d 100644 --- a/android/res/values-fi/strings.xml +++ b/android/res/values-fi/strings.xml @@ -799,6 +799,7 @@ Autotalli Rakennus Rautatieasema + Hauta Panimo Puuseppä Sähkömies @@ -1133,6 +1134,7 @@ Jäätikkö Pelto Järvi + Lukko kammio Lampi Säiliö Vesisäiliö diff --git a/android/res/values-fr/strings.xml b/android/res/values-fr/strings.xml index b2d99f6c3e..0dcfbae83e 100644 --- a/android/res/values-fr/strings.xml +++ b/android/res/values-fr/strings.xml @@ -824,6 +824,7 @@ Bâtiment Gare Entrepôt + La tombe Artisanat Brasserie artisanale Charpentier @@ -1202,6 +1203,7 @@ Lande Source chaude Lac + Chambre de verrouillage Étang Réservoir Réservoir @@ -1411,7 +1413,6 @@ Fossé Fossé Cale - Écluse Porte d\'écluse Rivière Rivière diff --git a/android/res/values-hu/strings.xml b/android/res/values-hu/strings.xml index 6488b31e5e..c5e423a10d 100644 --- a/android/res/values-hu/strings.xml +++ b/android/res/values-hu/strings.xml @@ -786,6 +786,7 @@ Garázs Épület Vonatmegálló + Sír Sörfőzde Ács Villanyszerelő @@ -1118,6 +1119,7 @@ Gleccser Mező Tó + Zsilipkamra Tavacska Rezervoár Vízgyűjtő diff --git a/android/res/values-in/strings.xml b/android/res/values-in/strings.xml index 21aa0320a8..e84f7c5aa4 100644 --- a/android/res/values-in/strings.xml +++ b/android/res/values-in/strings.xml @@ -782,6 +782,7 @@ Garasi Gedung Rel kereta api + Kuburan Toko minuman Tukang kayu Tukang listrik @@ -1113,6 +1114,7 @@ Gletser Ladang Danau + Ruang Kunci Kolam Waduk Sebuah baskom air diff --git a/android/res/values-it/strings.xml b/android/res/values-it/strings.xml index 98d3a58f31..da8543c9e7 100644 --- a/android/res/values-it/strings.xml +++ b/android/res/values-it/strings.xml @@ -812,6 +812,7 @@ Edificio Edificio Stazione ferroviaria + La tomba Birrificio Falegname Elettricista @@ -1145,6 +1146,7 @@ Ghiacciaio Campo Lago + Camera di blocco Stagno Serbatoio Bacino d\'acqua diff --git a/android/res/values-iw/strings.xml b/android/res/values-iw/strings.xml index c51517338a..da1501f160 100644 --- a/android/res/values-iw/strings.xml +++ b/android/res/values-iw/strings.xml @@ -226,6 +226,7 @@ תוללוס + רבק מטבח אפריקאי מטבח אמריקאי מטבח ערבי @@ -406,6 +407,7 @@ אגן מים קינקיפ ןחלוש + לוענמ את מאגר אגן מים גוף מים diff --git a/android/res/values-ja/strings.xml b/android/res/values-ja/strings.xml index ae7f28f33d..f367764d5f 100644 --- a/android/res/values-ja/strings.xml +++ b/android/res/values-ja/strings.xml @@ -817,6 +817,7 @@ 車庫 建物 鉄道駅 + 墓 工房 醸造所 大工 @@ -1214,6 +1215,7 @@ ヒース 温泉 湖 + ロックチャンバー 池 貯水池 水地 diff --git a/android/res/values-ko/strings.xml b/android/res/values-ko/strings.xml index 6de0befdc4..defb884cb2 100644 --- a/android/res/values-ko/strings.xml +++ b/android/res/values-ko/strings.xml @@ -786,6 +786,7 @@ 차고 건물 기차역 + 무덤 양조장 목수 전기기술자 @@ -1120,6 +1121,7 @@ 빙하 밭 호수 + 잠금 챔버 연못이 저수지 저수지 diff --git a/android/res/values-nb/strings.xml b/android/res/values-nb/strings.xml index 8998dcd21d..aaf6185c2e 100644 --- a/android/res/values-nb/strings.xml +++ b/android/res/values-nb/strings.xml @@ -783,6 +783,7 @@ Verksted Bygning Togstasjon + Grav Bryggeri Snekker Elektriker @@ -1114,6 +1115,7 @@ Isbre Slette Innsjø + Låsekammer Dam Reservoar Vannvask diff --git a/android/res/values-nl/strings.xml b/android/res/values-nl/strings.xml index b5a6eac054..fef5ca5fd4 100644 --- a/android/res/values-nl/strings.xml +++ b/android/res/values-nl/strings.xml @@ -787,6 +787,7 @@ Gebouw Gebouw Station + Graf Brouwerij Timmerman Elektricien @@ -1124,6 +1125,7 @@ Heide Heetwaterbron Meer + Slotkamer Plas Reservoir Waterbassin diff --git a/android/res/values-pl/strings.xml b/android/res/values-pl/strings.xml index 54f327a6ae..4b3ce96364 100644 --- a/android/res/values-pl/strings.xml +++ b/android/res/values-pl/strings.xml @@ -846,6 +846,7 @@ Garaż Część budynku Dworzec kolejowy + Mogiła Rzemiosło Browar Stolarz @@ -1237,6 +1238,7 @@ Wrzosowisko Gorące źródło Jezioro + Komora zamka Staw Zbiornik Zbiornik diff --git a/android/res/values-pt-rBR/strings.xml b/android/res/values-pt-rBR/strings.xml index 558ab34174..8861b7f19d 100644 --- a/android/res/values-pt-rBR/strings.xml +++ b/android/res/values-pt-rBR/strings.xml @@ -864,6 +864,7 @@ Edifício Estação de trem Armazém + Túmulo Ofícios Cervejaria artesanal Carpinteiro @@ -1263,6 +1264,7 @@ Charneca Nascente de água quente Lago + Câmara de Bloqueio Lagoa Reservatório Rio @@ -1544,7 +1546,6 @@ Doca Valeta de drenagem Valeta de drenagem - Eclusa Comporta de eclusa Rio Rio diff --git a/android/res/values-pt/strings.xml b/android/res/values-pt/strings.xml index aca9e5f623..681f5281f0 100644 --- a/android/res/values-pt/strings.xml +++ b/android/res/values-pt/strings.xml @@ -846,6 +846,7 @@ Edifício Estação de comboios Armazém + Túmulo Ofícios Cervejaria artesanal Carpinteiro @@ -1245,6 +1246,7 @@ Charneca Nascente de água quente Lago + Câmara de Bloqueio Lagoa Reservatório Reservatório @@ -1527,7 +1529,6 @@ Doca Valeta de drenagem Valeta de drenagem - Eclusa Comporta de eclusa Rio Rio diff --git a/android/res/values-ro/strings.xml b/android/res/values-ro/strings.xml index 695f9d4979..03cf3b2879 100644 --- a/android/res/values-ro/strings.xml +++ b/android/res/values-ro/strings.xml @@ -809,6 +809,7 @@ Garaj Clădire Feroviar + Mormânt Berărie Tâmplar Peisagist @@ -1139,6 +1140,7 @@ Ghețar Câmp Lac + Camera de blocare Heleșteu Rezervor Bazin de apă diff --git a/android/res/values-ru/strings.xml b/android/res/values-ru/strings.xml index 0cf22eb4d0..796e82c1ef 100644 --- a/android/res/values-ru/strings.xml +++ b/android/res/values-ru/strings.xml @@ -903,17 +903,25 @@ Здание Ж/д вокзал Склад + Могила Мастерская + Пчеловод + Кузнец Крафтовое пиво Столяр + Кондитер Электрик + Ремонт электроники Садовник + Декоративный мастер Кондиционеры Металлоконструкции Маляр Фотограф Сантехник + Лесопилка Ремонт обуви + Винодельня Ателье Африканская кухня Американская кухня @@ -1314,6 +1322,7 @@ Пустошь Горячий источник Озеро + Шлюзовая камера Пруд Водохранилище Резервуар @@ -1603,7 +1612,6 @@ Причал Водоотвод Водоотвод - Шлюз Шлюз Река Река diff --git a/android/res/values-sk/strings.xml b/android/res/values-sk/strings.xml index 2d48855b0a..dfedbfa85a 100644 --- a/android/res/values-sk/strings.xml +++ b/android/res/values-sk/strings.xml @@ -785,6 +785,7 @@ Garáž Budova Železničná stanica + Hrob Pivovar Tesár Elektrikár @@ -1116,6 +1117,7 @@ Ľadovec Lúka Jazero + Uzamykacia komora Rybník Nádrž Vodná nádrž diff --git a/android/res/values-sv/strings.xml b/android/res/values-sv/strings.xml index 29cc4bb1e2..48ed6ca7a7 100644 --- a/android/res/values-sv/strings.xml +++ b/android/res/values-sv/strings.xml @@ -782,6 +782,7 @@ Byggnad Byggnad Tågstation + Grav Bryggeri Snickare Elektriker @@ -1112,6 +1113,7 @@ Glaciär Fältet Sjö + Låskammare Damm Reservoar Vattenbassäng diff --git a/android/res/values-sw/strings.xml b/android/res/values-sw/strings.xml index 7aa5958a4a..7874885221 100644 --- a/android/res/values-sw/strings.xml +++ b/android/res/values-sw/strings.xml @@ -233,6 +233,7 @@ Betri Mashine ya kuuzia tiketi za usafiri wa umma Hifadhi ya taifa + Kaburi Kahawa Maabara ya Matibabu @@ -346,6 +347,7 @@ Chemchem ya maji moto Mto barafu Shamba + Chumba cha kufuli Hifadhi Bonde la Maji Eneo la Vichaka diff --git a/android/res/values-th/strings.xml b/android/res/values-th/strings.xml index 89e81bddfe..ceb2034b5c 100644 --- a/android/res/values-th/strings.xml +++ b/android/res/values-th/strings.xml @@ -789,6 +789,7 @@ อาคารจอดรถ อาคาร สถานีรถไฟ + หลุมฝังศพ โรงเบียร์ ช่างไม้ ช่างไฟฟ้า @@ -1124,6 +1125,7 @@ ธารน้ำแข็ง ทุ่งหญ้า ทะเลสาบ + ห้องล็อค บ่อ อ่างเก็บน้ำ อ่างน้ำ diff --git a/android/res/values-tr/strings.xml b/android/res/values-tr/strings.xml index de5f1da82a..8aab56ba71 100644 --- a/android/res/values-tr/strings.xml +++ b/android/res/values-tr/strings.xml @@ -877,6 +877,7 @@ Bina Tren İstasyonu Depo + Mezar Zanaat Bira Fabrikası Marangoz @@ -1285,6 +1286,7 @@ Çalı Kaplıca Göl + Kilit Odası Gölet Rezervuar Havza @@ -1567,7 +1569,6 @@ Rıhtım Lağım Lağım - Kanal Havuzu Kilit Kapısı Nehir Nehir diff --git a/android/res/values-uk/strings.xml b/android/res/values-uk/strings.xml index b79c7f4182..458dac6edb 100644 --- a/android/res/values-uk/strings.xml +++ b/android/res/values-uk/strings.xml @@ -874,6 +874,7 @@ Будівля Залізничний вокзал Склад + Могила Майстерня Пивоварня Столяр @@ -1282,6 +1283,7 @@ Пустище Горяче джерело Озеро + Замкова камера Ставок Водосховище Резервуар @@ -1564,7 +1566,6 @@ Причал Водовiдвiд Водовiдвiд - Шлюз Шлюз Річка Річка diff --git a/android/res/values-vi/strings.xml b/android/res/values-vi/strings.xml index 6534bd1123..4bfb8f6c9c 100644 --- a/android/res/values-vi/strings.xml +++ b/android/res/values-vi/strings.xml @@ -786,6 +786,7 @@ Gara Tòa nhà Đường tàu hỏa + Phần mộ Nhà máy bia Thợ mộc Thợ điện @@ -1119,6 +1120,7 @@ Sông băng Cánh đồng Hồ + Khoang khóa Ao Hồ chứa Một chậu nước diff --git a/android/res/values-zh-rTW/strings.xml b/android/res/values-zh-rTW/strings.xml index f24f549be4..4c7a8f7f03 100644 --- a/android/res/values-zh-rTW/strings.xml +++ b/android/res/values-zh-rTW/strings.xml @@ -821,6 +821,7 @@ 車庫 建築物 鐵道 + 墓穴 釀酒廠 木工 電工 @@ -1164,6 +1165,7 @@ 冰川 田野 湖泊 + 鎖室 潭 水庫 水庫 diff --git a/android/res/values-zh/strings.xml b/android/res/values-zh/strings.xml index a6596eb361..55a058f2a7 100644 --- a/android/res/values-zh/strings.xml +++ b/android/res/values-zh/strings.xml @@ -839,6 +839,7 @@ 建筑物 火车站建筑 仓库 + 墓穴 工艺作坊 酿酒厂 木匠 @@ -1232,6 +1233,7 @@ 荒野 温泉 湖 + 锁室 池塘 水库 水盆地 diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml index 096cccf69e..49245b6448 100644 --- a/android/res/values/strings.xml +++ b/android/res/values/strings.xml @@ -917,17 +917,25 @@ Building Train Station Warehouse + Grave Craft + beekeeper + Blacksmith Craft Brewery Carpenter + Confectionery Electrician + Electronics repair Gardener + Handicraft Hvac Metal Worker Painter Photographer Plumber + Sawmill Shoe Repair + Winery Tailor African American @@ -1345,6 +1353,7 @@ Heath Hot Spring Lake + Lock Chamber Pond Reservoir Basin @@ -1634,7 +1643,6 @@ Waterway Dock Drain Drain - Waterway Lock Lock Gate River River diff --git a/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings index 72d34a90af..3d80b56235 100644 --- a/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings @@ -1569,16 +1569,28 @@ "type.building.warehouse" = "Warehouse"; +"type.cemetery.grave" = "ﺮﻴﻄﺧ"; + "type.craft" = "Craft"; +"type.craft.beekeeper" = "beekeeper"; + +"type.craft.blacksmith" = "Blacksmith"; + "type.craft.brewery" = "مصنع جعة"; "type.craft.carpenter" = "نجار"; +"type.craft.confectionery" = "Confectionery"; + "type.craft.electrician" = "كهربائي"; +"type.craft.electronics_repair" = "Electronics repair"; + "type.craft.gardener" = "مهندس مناظر"; +"type.craft.handicraft" = "Handicraft"; + "type.craft.hvac" = "تكييف"; "type.craft.metal_construction" = "عامل معادن"; @@ -1589,8 +1601,12 @@ "type.craft.plumber" = "سمكري"; +"type.craft.sawmill" = "Sawmill"; + "type.craft.shoemaker" = "تصليح الاحذية"; +"type.craft.winery" = "Winery"; + "type.craft.tailor" = "خياط"; "type.cuisine.african" = "مطبخ أفريقي"; @@ -2377,6 +2393,8 @@ "type.natural.water.lake" = "بحيرة"; +"type.natural.water.lock" = "ﻞﻔﻘﻟﺍ ﺔﻓﺮﻏ"; + "type.natural.water.pond" = "بركة"; "type.natural.water.reservoir" = "خزان"; @@ -2955,8 +2973,6 @@ "type.waterway.drain.tunnel" = "Drain"; -"type.waterway.lock" = "Waterway Lock"; - "type.waterway.lock_gate" = "بوابة هويس"; "type.waterway.river" = "نهر"; diff --git a/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings index 3407e24a60..d1fddf6025 100644 --- a/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings @@ -1569,16 +1569,28 @@ "type.building.warehouse" = "Warehouse"; +"type.cemetery.grave" = "Магіла"; + "type.craft" = "Craft"; +"type.craft.beekeeper" = "beekeeper"; + +"type.craft.blacksmith" = "Blacksmith"; + "type.craft.brewery" = "Craft Brewery"; "type.craft.carpenter" = "Carpenter"; +"type.craft.confectionery" = "Confectionery"; + "type.craft.electrician" = "Electrician"; +"type.craft.electronics_repair" = "Electronics repair"; + "type.craft.gardener" = "Gardener"; +"type.craft.handicraft" = "Handicraft"; + "type.craft.hvac" = "Hvac"; "type.craft.metal_construction" = "Металаканструкцыі"; @@ -1589,8 +1601,12 @@ "type.craft.plumber" = "Plumber"; +"type.craft.sawmill" = "Sawmill"; + "type.craft.shoemaker" = "Shoe Repair"; +"type.craft.winery" = "Winery"; + "type.craft.tailor" = "Tailor"; "type.cuisine.african" = "African"; @@ -2377,6 +2393,8 @@ "type.natural.water.lake" = "Lake"; +"type.natural.water.lock" = "Шлюзавая камера"; + "type.natural.water.pond" = "Сажалка"; "type.natural.water.reservoir" = "Вадасховішча"; @@ -2955,8 +2973,6 @@ "type.waterway.drain.tunnel" = "Drain"; -"type.waterway.lock" = "Waterway Lock"; - "type.waterway.lock_gate" = "Lock Gate"; "type.waterway.river" = "Рака"; diff --git a/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings index c3dd6b2531..b8b93fa8e9 100644 --- a/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings @@ -1569,16 +1569,28 @@ "type.building.warehouse" = "Warehouse"; +"type.cemetery.grave" = "Гроб"; + "type.craft" = "Craft"; +"type.craft.beekeeper" = "beekeeper"; + +"type.craft.blacksmith" = "Blacksmith"; + "type.craft.brewery" = "Craft Brewery"; "type.craft.carpenter" = "Carpenter"; +"type.craft.confectionery" = "Confectionery"; + "type.craft.electrician" = "Electrician"; +"type.craft.electronics_repair" = "Electronics repair"; + "type.craft.gardener" = "Gardener"; +"type.craft.handicraft" = "Handicraft"; + "type.craft.hvac" = "Hvac"; "type.craft.metal_construction" = "Метални конструкции"; @@ -1589,8 +1601,12 @@ "type.craft.plumber" = "Plumber"; +"type.craft.sawmill" = "Sawmill"; + "type.craft.shoemaker" = "Shoe Repair"; +"type.craft.winery" = "Winery"; + "type.craft.tailor" = "Tailor"; "type.cuisine.african" = "African"; @@ -2377,6 +2393,8 @@ "type.natural.water.lake" = "Lake"; +"type.natural.water.lock" = "Заключваща камера"; + "type.natural.water.pond" = "Pond"; "type.natural.water.reservoir" = "Резервоар"; @@ -2955,8 +2973,6 @@ "type.waterway.drain.tunnel" = "Drain"; -"type.waterway.lock" = "Waterway Lock"; - "type.waterway.lock_gate" = "Lock Gate"; "type.waterway.river" = "River"; diff --git a/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings index 6d3319ac04..0e1d0a5606 100644 --- a/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings @@ -1569,16 +1569,28 @@ "type.building.warehouse" = "Warehouse"; +"type.cemetery.grave" = "Hrob"; + "type.craft" = "Craft"; +"type.craft.beekeeper" = "beekeeper"; + +"type.craft.blacksmith" = "Blacksmith"; + "type.craft.brewery" = "Pivovar"; "type.craft.carpenter" = "Truhlář"; +"type.craft.confectionery" = "Confectionery"; + "type.craft.electrician" = "Elektrikář"; +"type.craft.electronics_repair" = "Electronics repair"; + "type.craft.gardener" = "Zahradník"; +"type.craft.handicraft" = "Handicraft"; + "type.craft.hvac" = "HVAC"; "type.craft.metal_construction" = "Kovodílna"; @@ -1589,8 +1601,12 @@ "type.craft.plumber" = "Instalatér"; +"type.craft.sawmill" = "Sawmill"; + "type.craft.shoemaker" = "Opravna obuvi"; +"type.craft.winery" = "Winery"; + "type.craft.tailor" = "Krejčí"; "type.cuisine.african" = "Africká kuchyně"; @@ -2377,6 +2393,8 @@ "type.natural.water.lake" = "Jezero"; +"type.natural.water.lock" = "Zámková komora"; + "type.natural.water.pond" = "Rybník"; "type.natural.water.reservoir" = "Nádrž"; @@ -2955,8 +2973,6 @@ "type.waterway.drain.tunnel" = "Drain"; -"type.waterway.lock" = "Waterway Lock"; - "type.waterway.lock_gate" = "Stavidlo"; "type.waterway.river" = "Řeka"; diff --git a/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings index a661d9fdf2..61bdd609ae 100644 --- a/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings @@ -1569,16 +1569,28 @@ "type.building.warehouse" = "Warehouse"; +"type.cemetery.grave" = "Grav"; + "type.craft" = "Craft"; +"type.craft.beekeeper" = "beekeeper"; + +"type.craft.blacksmith" = "Blacksmith"; + "type.craft.brewery" = "Bryggeri"; "type.craft.carpenter" = "Tømrer"; +"type.craft.confectionery" = "Confectionery"; + "type.craft.electrician" = "Elektriker"; +"type.craft.electronics_repair" = "Electronics repair"; + "type.craft.gardener" = "Gartner"; +"type.craft.handicraft" = "Handicraft"; + "type.craft.hvac" = "Blikkenslager"; "type.craft.metal_construction" = "Metalarbejder"; @@ -1589,8 +1601,12 @@ "type.craft.plumber" = "VVS-mand"; +"type.craft.sawmill" = "Sawmill"; + "type.craft.shoemaker" = "Skomager"; +"type.craft.winery" = "Winery"; + "type.craft.tailor" = "Skrædder"; "type.cuisine.african" = "Afrikansk"; @@ -2377,6 +2393,8 @@ "type.natural.water.lake" = "Sø"; +"type.natural.water.lock" = "Låsekammer"; + "type.natural.water.pond" = "Dam"; "type.natural.water.reservoir" = "Reservoir"; @@ -2955,8 +2973,6 @@ "type.waterway.drain.tunnel" = "Drain"; -"type.waterway.lock" = "Waterway Lock"; - "type.waterway.lock_gate" = "Låseport"; "type.waterway.river" = "Flod"; diff --git a/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings index 40b4505124..a347ef7d7f 100644 --- a/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings @@ -1569,16 +1569,28 @@ "type.building.warehouse" = "Warehouse"; +"type.cemetery.grave" = "Grab"; + "type.craft" = "Craft"; +"type.craft.beekeeper" = "beekeeper"; + +"type.craft.blacksmith" = "Blacksmith"; + "type.craft.brewery" = "Brauerei"; "type.craft.carpenter" = "Zimmermann"; +"type.craft.confectionery" = "Confectionery"; + "type.craft.electrician" = "Elektriker"; +"type.craft.electronics_repair" = "Electronics repair"; + "type.craft.gardener" = "Landschaftsgärtner"; +"type.craft.handicraft" = "Handicraft"; + "type.craft.hvac" = "Heizung"; "type.craft.metal_construction" = "Schlosser"; @@ -1589,8 +1601,12 @@ "type.craft.plumber" = "Installateur"; +"type.craft.sawmill" = "Sawmill"; + "type.craft.shoemaker" = "Schuhmacher"; +"type.craft.winery" = "Winery"; + "type.craft.tailor" = "Schneider"; "type.cuisine.african" = "Afrikanische Küche"; @@ -2377,6 +2393,8 @@ "type.natural.water.lake" = "See"; +"type.natural.water.lock" = "Schleusenkammer"; + "type.natural.water.pond" = "Teich"; "type.natural.water.reservoir" = "Reservoir"; @@ -2955,8 +2973,6 @@ "type.waterway.drain.tunnel" = "Abfluss"; -"type.waterway.lock" = "Schleuse"; - "type.waterway.lock_gate" = "Schleusentor"; "type.waterway.river" = "Fluss"; diff --git a/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings index 3342b32d47..96e575ff53 100644 --- a/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings @@ -1569,16 +1569,28 @@ "type.building.warehouse" = "Warehouse"; +"type.cemetery.grave" = "Τάφος"; + "type.craft" = "Craft"; +"type.craft.beekeeper" = "beekeeper"; + +"type.craft.blacksmith" = "Blacksmith"; + "type.craft.brewery" = "Ζυθοποιείο"; "type.craft.carpenter" = "Ξυλουργός"; +"type.craft.confectionery" = "Confectionery"; + "type.craft.electrician" = "Ηλεκτρολόγος"; +"type.craft.electronics_repair" = "Electronics repair"; + "type.craft.gardener" = "Κηπουρός"; +"type.craft.handicraft" = "Handicraft"; + "type.craft.hvac" = "Ψυκτικός"; "type.craft.metal_construction" = "Μεταλλουργός"; @@ -1589,8 +1601,12 @@ "type.craft.plumber" = "Υδραυλικός"; +"type.craft.sawmill" = "Sawmill"; + "type.craft.shoemaker" = "Υποδηματοποιός"; +"type.craft.winery" = "Winery"; + "type.craft.tailor" = "Ράφτης"; "type.cuisine.african" = "Αφρικανική"; @@ -2377,6 +2393,8 @@ "type.natural.water.lake" = "Λίμνη"; +"type.natural.water.lock" = "Θάλαμος κλειδαριάς"; + "type.natural.water.pond" = "Δεξαμενή"; "type.natural.water.reservoir" = "Δεξαμενή"; @@ -2955,8 +2973,6 @@ "type.waterway.drain.tunnel" = "Drain"; -"type.waterway.lock" = "Waterway Lock"; - "type.waterway.lock_gate" = "Φράγμα"; "type.waterway.river" = "Ποταμός"; diff --git a/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings index 2a133f1ce7..0d289aaf32 100644 --- a/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings @@ -1569,16 +1569,28 @@ "type.building.warehouse" = "Warehouse"; +"type.cemetery.grave" = "Grave"; + "type.craft" = "Craft"; +"type.craft.beekeeper" = "beekeeper"; + +"type.craft.blacksmith" = "Blacksmith"; + "type.craft.brewery" = "Craft Brewery"; "type.craft.carpenter" = "Carpenter"; +"type.craft.confectionery" = "Confectionery"; + "type.craft.electrician" = "Electrician"; +"type.craft.electronics_repair" = "Electronics repair"; + "type.craft.gardener" = "Gardener"; +"type.craft.handicraft" = "Handicraft"; + "type.craft.hvac" = "Hvac"; "type.craft.metal_construction" = "Metal Worker"; @@ -1589,8 +1601,12 @@ "type.craft.plumber" = "Plumber"; +"type.craft.sawmill" = "Sawmill"; + "type.craft.shoemaker" = "Shoe Repair"; +"type.craft.winery" = "Winery"; + "type.craft.tailor" = "Tailor"; "type.cuisine.african" = "African"; @@ -2377,6 +2393,8 @@ "type.natural.water.lake" = "Lake"; +"type.natural.water.lock" = "Lock Chamber"; + "type.natural.water.pond" = "Pond"; "type.natural.water.reservoir" = "Reservoir"; @@ -2955,8 +2973,6 @@ "type.waterway.drain.tunnel" = "Drain"; -"type.waterway.lock" = "Waterway Lock"; - "type.waterway.lock_gate" = "Lock Gate"; "type.waterway.river" = "River"; diff --git a/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings index 15105ce892..b873665ad7 100644 --- a/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings @@ -1569,16 +1569,28 @@ "type.building.warehouse" = "Warehouse"; +"type.cemetery.grave" = "Grave"; + "type.craft" = "Craft"; +"type.craft.beekeeper" = "beekeeper"; + +"type.craft.blacksmith" = "Blacksmith"; + "type.craft.brewery" = "Craft Brewery"; "type.craft.carpenter" = "Carpenter"; +"type.craft.confectionery" = "Confectionery"; + "type.craft.electrician" = "Electrician"; +"type.craft.electronics_repair" = "Electronics repair"; + "type.craft.gardener" = "Gardener"; +"type.craft.handicraft" = "Handicraft"; + "type.craft.hvac" = "Hvac"; "type.craft.metal_construction" = "Metal Worker"; @@ -1589,8 +1601,12 @@ "type.craft.plumber" = "Plumber"; +"type.craft.sawmill" = "Sawmill"; + "type.craft.shoemaker" = "Shoe Repair"; +"type.craft.winery" = "Winery"; + "type.craft.tailor" = "Tailor"; "type.cuisine.african" = "African"; @@ -2377,6 +2393,8 @@ "type.natural.water.lake" = "Lake"; +"type.natural.water.lock" = "Lock Chamber"; + "type.natural.water.pond" = "Pond"; "type.natural.water.reservoir" = "Reservoir"; @@ -2955,8 +2973,6 @@ "type.waterway.drain.tunnel" = "Drain"; -"type.waterway.lock" = "Waterway Lock"; - "type.waterway.lock_gate" = "Lock Gate"; "type.waterway.river" = "River"; diff --git a/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings index b0878c1ccc..9378934609 100644 --- a/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings @@ -1569,16 +1569,28 @@ "type.building.warehouse" = "Almacén"; +"type.cemetery.grave" = "Tumba"; + "type.craft" = "Craft"; +"type.craft.beekeeper" = "beekeeper"; + +"type.craft.blacksmith" = "Blacksmith"; + "type.craft.brewery" = "Fábrica de cerveza"; "type.craft.carpenter" = "Carpintero"; +"type.craft.confectionery" = "Confectionery"; + "type.craft.electrician" = "Electricista"; +"type.craft.electronics_repair" = "Electronics repair"; + "type.craft.gardener" = "Paisajista"; +"type.craft.handicraft" = "Handicraft"; + "type.craft.hvac" = "Aire acondicionado"; "type.craft.metal_construction" = "Trabajador del metal"; @@ -1589,8 +1601,12 @@ "type.craft.plumber" = "Fontanero"; +"type.craft.sawmill" = "Sawmill"; + "type.craft.shoemaker" = "Zapatero"; +"type.craft.winery" = "Winery"; + "type.craft.tailor" = "Sastre"; "type.cuisine.african" = "Cocina africana"; @@ -2377,6 +2393,8 @@ "type.natural.water.lake" = "Lago"; +"type.natural.water.lock" = "Cámara de bloqueo"; + "type.natural.water.pond" = "Estanque"; "type.natural.water.reservoir" = "Embalse"; @@ -2955,8 +2973,6 @@ "type.waterway.drain.tunnel" = "Drain"; -"type.waterway.lock" = "Waterway Lock"; - "type.waterway.lock_gate" = "Compuerta"; "type.waterway.river" = "Río"; diff --git a/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings index 05187e4f6b..c2903350f4 100644 --- a/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings @@ -1569,16 +1569,28 @@ "type.building.warehouse" = "Almacén"; +"type.cemetery.grave" = "Tumba"; + "type.craft" = "Craft"; +"type.craft.beekeeper" = "beekeeper"; + +"type.craft.blacksmith" = "Blacksmith"; + "type.craft.brewery" = "Fábrica de cerveza"; "type.craft.carpenter" = "Carpintero"; +"type.craft.confectionery" = "Confectionery"; + "type.craft.electrician" = "Electricista"; +"type.craft.electronics_repair" = "Electronics repair"; + "type.craft.gardener" = "Paisajista"; +"type.craft.handicraft" = "Handicraft"; + "type.craft.hvac" = "Aire acondicionado"; "type.craft.metal_construction" = "Trabajador del metal"; @@ -1589,8 +1601,12 @@ "type.craft.plumber" = "Fontanero"; +"type.craft.sawmill" = "Sawmill"; + "type.craft.shoemaker" = "Zapatero"; +"type.craft.winery" = "Winery"; + "type.craft.tailor" = "Sastre"; "type.cuisine.african" = "Cocina africana"; @@ -2377,6 +2393,8 @@ "type.natural.water.lake" = "Lago"; +"type.natural.water.lock" = "Cámara de bloqueo"; + "type.natural.water.pond" = "Estanque"; "type.natural.water.reservoir" = "Embalse"; @@ -2955,8 +2973,6 @@ "type.waterway.drain.tunnel" = "Drain"; -"type.waterway.lock" = "Waterway Lock"; - "type.waterway.lock_gate" = "Compuerta"; "type.waterway.river" = "Río"; diff --git a/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings index 0d98d2469f..d1404c3813 100644 --- a/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings @@ -1569,16 +1569,28 @@ "type.building.warehouse" = "Denda"; +"type.cemetery.grave" = "Hilobia"; + "type.craft" = "Craft"; +"type.craft.beekeeper" = "beekeeper"; + +"type.craft.blacksmith" = "Blacksmith"; + "type.craft.brewery" = "Garagardo fabrika"; "type.craft.carpenter" = "Arotza"; +"type.craft.confectionery" = "Confectionery"; + "type.craft.electrician" = "Elektrizista teknikaria"; +"type.craft.electronics_repair" = "Electronics repair"; + "type.craft.gardener" = "Paisaia"; +"type.craft.handicraft" = "Handicraft"; + "type.craft.hvac" = "Aire girotua"; "type.craft.metal_construction" = "Metalgintzako langilea"; @@ -1589,8 +1601,12 @@ "type.craft.plumber" = "Iturgina"; +"type.craft.sawmill" = "Sawmill"; + "type.craft.shoemaker" = "Zapataria"; +"type.craft.winery" = "Winery"; + "type.craft.tailor" = "Jostun"; "type.cuisine.african" = "Afrikako sukaldaritza"; @@ -2377,6 +2393,8 @@ "type.natural.water.lake" = "Lakua"; +"type.natural.water.lock" = "Sarraila Ganbera"; + "type.natural.water.pond" = "Urmaela"; "type.natural.water.reservoir" = "Urtegia"; @@ -2955,8 +2973,6 @@ "type.waterway.drain.tunnel" = "Drain"; -"type.waterway.lock" = "Waterway Lock"; - "type.waterway.lock_gate" = "Atea"; "type.waterway.river" = "Ibai"; diff --git a/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings index 9540887636..27ad60914b 100644 --- a/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings @@ -1569,16 +1569,28 @@ "type.building.warehouse" = "Warehouse"; +"type.cemetery.grave" = "ﺮﺒﻗ"; + "type.craft" = "Craft"; +"type.craft.beekeeper" = "beekeeper"; + +"type.craft.blacksmith" = "Blacksmith"; + "type.craft.brewery" = "کارخانه ابجوسازی"; "type.craft.carpenter" = "نجار"; +"type.craft.confectionery" = "Confectionery"; + "type.craft.electrician" = "برق کار"; +"type.craft.electronics_repair" = "Electronics repair"; + "type.craft.gardener" = "باغبان"; +"type.craft.handicraft" = "Handicraft"; + "type.craft.hvac" = "Hvac"; "type.craft.metal_construction" = "اهن کار"; @@ -1589,8 +1601,12 @@ "type.craft.plumber" = "لوله کش"; +"type.craft.sawmill" = "Sawmill"; + "type.craft.shoemaker" = "کفاش"; +"type.craft.winery" = "Winery"; + "type.craft.tailor" = "خیاطی"; "type.cuisine.african" = "African"; @@ -2377,6 +2393,8 @@ "type.natural.water.lake" = "دریاچه"; +"type.natural.water.lock" = "ﻞﻔﻗ ﻕﺎﺗﺍ"; + "type.natural.water.pond" = "تالاب"; "type.natural.water.reservoir" = "مخزن"; @@ -2955,8 +2973,6 @@ "type.waterway.drain.tunnel" = "Drain"; -"type.waterway.lock" = "Waterway Lock"; - "type.waterway.lock_gate" = "Lock Gate"; "type.waterway.river" = "رودخانه"; diff --git a/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings index 88800c48ba..3d2f8d1e85 100644 --- a/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings @@ -1569,16 +1569,28 @@ "type.building.warehouse" = "Warehouse"; +"type.cemetery.grave" = "Hauta"; + "type.craft" = "Craft"; +"type.craft.beekeeper" = "beekeeper"; + +"type.craft.blacksmith" = "Blacksmith"; + "type.craft.brewery" = "Panimo"; "type.craft.carpenter" = "Puuseppä"; +"type.craft.confectionery" = "Confectionery"; + "type.craft.electrician" = "Sähkömies"; +"type.craft.electronics_repair" = "Electronics repair"; + "type.craft.gardener" = "Puutarhuri"; +"type.craft.handicraft" = "Handicraft"; + "type.craft.hvac" = "Ilmastointilaite"; "type.craft.metal_construction" = "Metallimies"; @@ -1589,8 +1601,12 @@ "type.craft.plumber" = "Putkimies"; +"type.craft.sawmill" = "Sawmill"; + "type.craft.shoemaker" = "Suutari"; +"type.craft.winery" = "Winery"; + "type.craft.tailor" = "Räätäli"; "type.cuisine.african" = "Afrikkalainen keittiö"; @@ -2377,6 +2393,8 @@ "type.natural.water.lake" = "Järvi"; +"type.natural.water.lock" = "Lukko kammio"; + "type.natural.water.pond" = "Lampi"; "type.natural.water.reservoir" = "Säiliö"; @@ -2955,8 +2973,6 @@ "type.waterway.drain.tunnel" = "Drain"; -"type.waterway.lock" = "Waterway Lock"; - "type.waterway.lock_gate" = "Kanavasulku"; "type.waterway.river" = "Joki"; diff --git a/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings index 6837c9d66e..ccc0a445b9 100644 --- a/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings @@ -1569,16 +1569,28 @@ "type.building.warehouse" = "Entrepôt"; +"type.cemetery.grave" = "La tombe"; + "type.craft" = "Artisanat"; +"type.craft.beekeeper" = "beekeeper"; + +"type.craft.blacksmith" = "Blacksmith"; + "type.craft.brewery" = "Brasserie artisanale"; "type.craft.carpenter" = "Charpentier"; +"type.craft.confectionery" = "Confectionery"; + "type.craft.electrician" = "Électricien"; +"type.craft.electronics_repair" = "Electronics repair"; + "type.craft.gardener" = "Paysagiste"; +"type.craft.handicraft" = "Handicraft"; + "type.craft.hvac" = "Climatiseur"; "type.craft.metal_construction" = "Métallo"; @@ -1589,8 +1601,12 @@ "type.craft.plumber" = "Plombier"; +"type.craft.sawmill" = "Sawmill"; + "type.craft.shoemaker" = "Cordonnier"; +"type.craft.winery" = "Winery"; + "type.craft.tailor" = "Tailleur"; "type.cuisine.african" = "Cuisine africaine"; @@ -2377,6 +2393,8 @@ "type.natural.water.lake" = "Lac"; +"type.natural.water.lock" = "Chambre de verrouillage"; + "type.natural.water.pond" = "Étang"; "type.natural.water.reservoir" = "Réservoir"; @@ -2955,8 +2973,6 @@ "type.waterway.drain.tunnel" = "Drain"; -"type.waterway.lock" = "Écluse"; - "type.waterway.lock_gate" = "Porte d'écluse"; "type.waterway.river" = "Rivière"; diff --git a/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings index 529a4c77e4..95d699bb76 100644 --- a/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings @@ -1569,16 +1569,28 @@ "type.building.warehouse" = "Warehouse"; +"type.cemetery.grave" = "רבק"; + "type.craft" = "Craft"; +"type.craft.beekeeper" = "beekeeper"; + +"type.craft.blacksmith" = "Blacksmith"; + "type.craft.brewery" = "Craft Brewery"; "type.craft.carpenter" = "Carpenter"; +"type.craft.confectionery" = "Confectionery"; + "type.craft.electrician" = "Electrician"; +"type.craft.electronics_repair" = "Electronics repair"; + "type.craft.gardener" = "Gardener"; +"type.craft.handicraft" = "Handicraft"; + "type.craft.hvac" = "Hvac"; "type.craft.metal_construction" = "Metal Worker"; @@ -1589,8 +1601,12 @@ "type.craft.plumber" = "Plumber"; +"type.craft.sawmill" = "Sawmill"; + "type.craft.shoemaker" = "Shoe Repair"; +"type.craft.winery" = "Winery"; + "type.craft.tailor" = "Tailor"; "type.cuisine.african" = "מטבח אפריקאי"; @@ -2377,6 +2393,8 @@ "type.natural.water.lake" = "Lake"; +"type.natural.water.lock" = "לוענמ את"; + "type.natural.water.pond" = "Pond"; "type.natural.water.reservoir" = "מאגר"; @@ -2955,8 +2973,6 @@ "type.waterway.drain.tunnel" = "Drain"; -"type.waterway.lock" = "Waterway Lock"; - "type.waterway.lock_gate" = "Lock Gate"; "type.waterway.river" = "River"; diff --git a/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings index c892401379..5b6bcca806 100644 --- a/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings @@ -1569,16 +1569,28 @@ "type.building.warehouse" = "Warehouse"; +"type.cemetery.grave" = "Sír"; + "type.craft" = "Craft"; +"type.craft.beekeeper" = "beekeeper"; + +"type.craft.blacksmith" = "Blacksmith"; + "type.craft.brewery" = "Sörfőzde"; "type.craft.carpenter" = "Ács"; +"type.craft.confectionery" = "Confectionery"; + "type.craft.electrician" = "Villanyszerelő"; +"type.craft.electronics_repair" = "Electronics repair"; + "type.craft.gardener" = "Kertész"; +"type.craft.handicraft" = "Handicraft"; + "type.craft.hvac" = "Hűtés-fűtés szerelő"; "type.craft.metal_construction" = "Lakatos"; @@ -1589,8 +1601,12 @@ "type.craft.plumber" = "Vízvezeték-szerelő"; +"type.craft.sawmill" = "Sawmill"; + "type.craft.shoemaker" = "Cipész"; +"type.craft.winery" = "Winery"; + "type.craft.tailor" = "Szabó"; "type.cuisine.african" = "Afrikai konyha"; @@ -2377,6 +2393,8 @@ "type.natural.water.lake" = "Tó"; +"type.natural.water.lock" = "Zsilipkamra"; + "type.natural.water.pond" = "Tavacska"; "type.natural.water.reservoir" = "Rezervoár"; @@ -2955,8 +2973,6 @@ "type.waterway.drain.tunnel" = "Drain"; -"type.waterway.lock" = "Waterway Lock"; - "type.waterway.lock_gate" = "Zsilip"; "type.waterway.river" = "Folyó"; diff --git a/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings index f19449f82f..264ddd7e5b 100644 --- a/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings @@ -1569,16 +1569,28 @@ "type.building.warehouse" = "Warehouse"; +"type.cemetery.grave" = "Kuburan"; + "type.craft" = "Craft"; +"type.craft.beekeeper" = "beekeeper"; + +"type.craft.blacksmith" = "Blacksmith"; + "type.craft.brewery" = "Toko minuman"; "type.craft.carpenter" = "Tukang kayu"; +"type.craft.confectionery" = "Confectionery"; + "type.craft.electrician" = "Tukang listrik"; +"type.craft.electronics_repair" = "Electronics repair"; + "type.craft.gardener" = "Tukang kebun"; +"type.craft.handicraft" = "Handicraft"; + "type.craft.hvac" = "Hvac"; "type.craft.metal_construction" = "Tukang besi"; @@ -1589,8 +1601,12 @@ "type.craft.plumber" = "Tukang pipa"; +"type.craft.sawmill" = "Sawmill"; + "type.craft.shoemaker" = "Tukang sepatu"; +"type.craft.winery" = "Winery"; + "type.craft.tailor" = "Tukang jahit"; "type.cuisine.african" = "Masakan afrika"; @@ -2377,6 +2393,8 @@ "type.natural.water.lake" = "Danau"; +"type.natural.water.lock" = "Ruang Kunci"; + "type.natural.water.pond" = "Kolam"; "type.natural.water.reservoir" = "Waduk"; @@ -2955,8 +2973,6 @@ "type.waterway.drain.tunnel" = "Drain"; -"type.waterway.lock" = "Waterway Lock"; - "type.waterway.lock_gate" = "Gerbang pengunci"; "type.waterway.river" = "Sungai"; diff --git a/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings index 1c896fd872..059de12e05 100644 --- a/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings @@ -1569,16 +1569,28 @@ "type.building.warehouse" = "Warehouse"; +"type.cemetery.grave" = "La tomba"; + "type.craft" = "Craft"; +"type.craft.beekeeper" = "beekeeper"; + +"type.craft.blacksmith" = "Blacksmith"; + "type.craft.brewery" = "Birrificio"; "type.craft.carpenter" = "Falegname"; +"type.craft.confectionery" = "Confectionery"; + "type.craft.electrician" = "Elettricista"; +"type.craft.electronics_repair" = "Electronics repair"; + "type.craft.gardener" = "Giardiniere"; +"type.craft.handicraft" = "Handicraft"; + "type.craft.hvac" = "Impianti HVAC"; "type.craft.metal_construction" = "Fabbro"; @@ -1589,8 +1601,12 @@ "type.craft.plumber" = "Idraulico"; +"type.craft.sawmill" = "Sawmill"; + "type.craft.shoemaker" = "Calzolaio"; +"type.craft.winery" = "Winery"; + "type.craft.tailor" = "Sarto"; "type.cuisine.african" = "Cucina africana"; @@ -2377,6 +2393,8 @@ "type.natural.water.lake" = "Lago"; +"type.natural.water.lock" = "Camera di blocco"; + "type.natural.water.pond" = "Stagno"; "type.natural.water.reservoir" = "Serbatoio"; @@ -2955,8 +2973,6 @@ "type.waterway.drain.tunnel" = "Drain"; -"type.waterway.lock" = "Waterway Lock"; - "type.waterway.lock_gate" = "Sbarramento"; "type.waterway.river" = "Fiume"; diff --git a/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings index e73f6714d5..a87f6961b6 100644 --- a/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings @@ -1569,16 +1569,28 @@ "type.building.warehouse" = "Warehouse"; +"type.cemetery.grave" = "墓"; + "type.craft" = "工房"; +"type.craft.beekeeper" = "beekeeper"; + +"type.craft.blacksmith" = "Blacksmith"; + "type.craft.brewery" = "醸造所"; "type.craft.carpenter" = "大工"; +"type.craft.confectionery" = "Confectionery"; + "type.craft.electrician" = "電気技師"; +"type.craft.electronics_repair" = "Electronics repair"; + "type.craft.gardener" = "造園家"; +"type.craft.handicraft" = "Handicraft"; + "type.craft.hvac" = "冷暖房空調"; "type.craft.metal_construction" = "金属工"; @@ -1589,8 +1601,12 @@ "type.craft.plumber" = "配管工"; +"type.craft.sawmill" = "Sawmill"; + "type.craft.shoemaker" = "靴修理"; +"type.craft.winery" = "Winery"; + "type.craft.tailor" = "仕立て屋"; "type.cuisine.african" = "アフリカ料理"; @@ -2377,6 +2393,8 @@ "type.natural.water.lake" = "湖"; +"type.natural.water.lock" = "ロックチャンバー"; + "type.natural.water.pond" = "池"; "type.natural.water.reservoir" = "貯水池"; @@ -2955,8 +2973,6 @@ "type.waterway.drain.tunnel" = "用水路"; -"type.waterway.lock" = "Waterway Lock"; - "type.waterway.lock_gate" = "水門"; "type.waterway.river" = "河川"; diff --git a/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings index 7ef5c0bc51..c444dea004 100644 --- a/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings @@ -1569,16 +1569,28 @@ "type.building.warehouse" = "Warehouse"; +"type.cemetery.grave" = "무덤"; + "type.craft" = "Craft"; +"type.craft.beekeeper" = "beekeeper"; + +"type.craft.blacksmith" = "Blacksmith"; + "type.craft.brewery" = "양조장"; "type.craft.carpenter" = "목수"; +"type.craft.confectionery" = "Confectionery"; + "type.craft.electrician" = "전기기술자"; +"type.craft.electronics_repair" = "Electronics repair"; + "type.craft.gardener" = "조경사"; +"type.craft.handicraft" = "Handicraft"; + "type.craft.hvac" = "냉난방기"; "type.craft.metal_construction" = "금속공"; @@ -1589,8 +1601,12 @@ "type.craft.plumber" = "배관공"; +"type.craft.sawmill" = "Sawmill"; + "type.craft.shoemaker" = "구두수선"; +"type.craft.winery" = "Winery"; + "type.craft.tailor" = "양복점"; "type.cuisine.african" = "아프리카식 음식"; @@ -2377,6 +2393,8 @@ "type.natural.water.lake" = "호수"; +"type.natural.water.lock" = "잠금 챔버"; + "type.natural.water.pond" = "연못이"; "type.natural.water.reservoir" = "저수지"; @@ -2955,8 +2973,6 @@ "type.waterway.drain.tunnel" = "Drain"; -"type.waterway.lock" = "Waterway Lock"; - "type.waterway.lock_gate" = "수문"; "type.waterway.river" = "강"; diff --git a/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings index 83c7b990d7..aa9bd2581c 100644 --- a/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings @@ -1569,16 +1569,28 @@ "type.building.warehouse" = "Warehouse"; +"type.cemetery.grave" = "Grav"; + "type.craft" = "Craft"; +"type.craft.beekeeper" = "beekeeper"; + +"type.craft.blacksmith" = "Blacksmith"; + "type.craft.brewery" = "Bryggeri"; "type.craft.carpenter" = "Snekker"; +"type.craft.confectionery" = "Confectionery"; + "type.craft.electrician" = "Elektriker"; +"type.craft.electronics_repair" = "Electronics repair"; + "type.craft.gardener" = "Anleggsgartner"; +"type.craft.handicraft" = "Handicraft"; + "type.craft.hvac" = "Klimaanlegg"; "type.craft.metal_construction" = "Metallarbeider"; @@ -1589,8 +1601,12 @@ "type.craft.plumber" = "Rørlegger"; +"type.craft.sawmill" = "Sawmill"; + "type.craft.shoemaker" = "Skoreparasjon"; +"type.craft.winery" = "Winery"; + "type.craft.tailor" = "Skredder"; "type.cuisine.african" = "Afrikansk mat"; @@ -2377,6 +2393,8 @@ "type.natural.water.lake" = "Innsjø"; +"type.natural.water.lock" = "Låsekammer"; + "type.natural.water.pond" = "Dam"; "type.natural.water.reservoir" = "Reservoar"; @@ -2955,8 +2973,6 @@ "type.waterway.drain.tunnel" = "Drain"; -"type.waterway.lock" = "Waterway Lock"; - "type.waterway.lock_gate" = "Sluseport"; "type.waterway.river" = "Elv"; diff --git a/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings index ff1599f33f..c96ad37875 100644 --- a/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings @@ -1569,16 +1569,28 @@ "type.building.warehouse" = "Warehouse"; +"type.cemetery.grave" = "Graf"; + "type.craft" = "Craft"; +"type.craft.beekeeper" = "beekeeper"; + +"type.craft.blacksmith" = "Blacksmith"; + "type.craft.brewery" = "Brouwerij"; "type.craft.carpenter" = "Timmerman"; +"type.craft.confectionery" = "Confectionery"; + "type.craft.electrician" = "Elektricien"; +"type.craft.electronics_repair" = "Electronics repair"; + "type.craft.gardener" = "Tuinarchitect"; +"type.craft.handicraft" = "Handicraft"; + "type.craft.hvac" = "Airconditioning"; "type.craft.metal_construction" = "Metaalarbeider"; @@ -1589,8 +1601,12 @@ "type.craft.plumber" = "Loodgieter"; +"type.craft.sawmill" = "Sawmill"; + "type.craft.shoemaker" = "Schoenmaker"; +"type.craft.winery" = "Winery"; + "type.craft.tailor" = "Kleermaker"; "type.cuisine.african" = "Afrikaans"; @@ -2377,6 +2393,8 @@ "type.natural.water.lake" = "Meer"; +"type.natural.water.lock" = "Slotkamer"; + "type.natural.water.pond" = "Plas"; "type.natural.water.reservoir" = "Reservoir"; @@ -2955,8 +2973,6 @@ "type.waterway.drain.tunnel" = "Drain"; -"type.waterway.lock" = "Waterway Lock"; - "type.waterway.lock_gate" = "Gesloten poort"; "type.waterway.river" = "Rivier"; diff --git a/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings index de2d5ea62d..5d8603ae0e 100644 --- a/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings @@ -1569,16 +1569,28 @@ "type.building.warehouse" = "Warehouse"; +"type.cemetery.grave" = "Mogiła"; + "type.craft" = "Rzemiosło"; +"type.craft.beekeeper" = "beekeeper"; + +"type.craft.blacksmith" = "Blacksmith"; + "type.craft.brewery" = "Browar"; "type.craft.carpenter" = "Stolarz"; +"type.craft.confectionery" = "Confectionery"; + "type.craft.electrician" = "Elektryk"; +"type.craft.electronics_repair" = "Electronics repair"; + "type.craft.gardener" = "Ogrodnik"; +"type.craft.handicraft" = "Handicraft"; + "type.craft.hvac" = "Klimatyzacja"; "type.craft.metal_construction" = "Ślusarz, obrabiacz metalu"; @@ -1589,8 +1601,12 @@ "type.craft.plumber" = "Hydraulik"; +"type.craft.sawmill" = "Sawmill"; + "type.craft.shoemaker" = "Szewc"; +"type.craft.winery" = "Winery"; + "type.craft.tailor" = "Krawiec"; "type.cuisine.african" = "Kuchnia afrykańska"; @@ -2377,6 +2393,8 @@ "type.natural.water.lake" = "Jezioro"; +"type.natural.water.lock" = "Komora zamka"; + "type.natural.water.pond" = "Staw"; "type.natural.water.reservoir" = "Zbiornik"; @@ -2955,8 +2973,6 @@ "type.waterway.drain.tunnel" = "Drain"; -"type.waterway.lock" = "Waterway Lock"; - "type.waterway.lock_gate" = "Wrota śluzy"; "type.waterway.river" = "Rzeka"; diff --git a/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings index b09de541ac..ce80ad7e2c 100644 --- a/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings @@ -1569,16 +1569,28 @@ "type.building.warehouse" = "Armazém"; +"type.cemetery.grave" = "Túmulo"; + "type.craft" = "Ofícios"; +"type.craft.beekeeper" = "beekeeper"; + +"type.craft.blacksmith" = "Blacksmith"; + "type.craft.brewery" = "Cervejaria artesanal"; "type.craft.carpenter" = "Carpinteiro"; +"type.craft.confectionery" = "Confectionery"; + "type.craft.electrician" = "Eletricista"; +"type.craft.electronics_repair" = "Electronics repair"; + "type.craft.gardener" = "Jardineiro"; +"type.craft.handicraft" = "Handicraft"; + "type.craft.hvac" = "Ar-condicionado"; "type.craft.metal_construction" = "Serralheiro metálico"; @@ -1589,8 +1601,12 @@ "type.craft.plumber" = "Encanador"; +"type.craft.sawmill" = "Sawmill"; + "type.craft.shoemaker" = "Sapateiro"; +"type.craft.winery" = "Winery"; + "type.craft.tailor" = "Alfaiate"; "type.cuisine.african" = "Cozinha africana"; @@ -2377,6 +2393,8 @@ "type.natural.water.lake" = "Lago"; +"type.natural.water.lock" = "Câmara de Bloqueio"; + "type.natural.water.pond" = "Lagoa"; "type.natural.water.reservoir" = "Reservatório"; @@ -2955,8 +2973,6 @@ "type.waterway.drain.tunnel" = "Valeta de drenagem"; -"type.waterway.lock" = "Eclusa"; - "type.waterway.lock_gate" = "Comporta de eclusa"; "type.waterway.river" = "Rio"; diff --git a/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings index da9ffeee47..08899cd1ee 100644 --- a/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings @@ -1569,16 +1569,28 @@ "type.building.warehouse" = "Armazém"; +"type.cemetery.grave" = "Túmulo"; + "type.craft" = "Ofícios"; +"type.craft.beekeeper" = "beekeeper"; + +"type.craft.blacksmith" = "Blacksmith"; + "type.craft.brewery" = "Cervejaria artesanal"; "type.craft.carpenter" = "Carpinteiro"; +"type.craft.confectionery" = "Confectionery"; + "type.craft.electrician" = "Eletricista"; +"type.craft.electronics_repair" = "Electronics repair"; + "type.craft.gardener" = "Jardineiro"; +"type.craft.handicraft" = "Handicraft"; + "type.craft.hvac" = "Instalador de ar-condicionado"; "type.craft.metal_construction" = "Serralheiro metálico"; @@ -1589,8 +1601,12 @@ "type.craft.plumber" = "Picheleiro"; +"type.craft.sawmill" = "Sawmill"; + "type.craft.shoemaker" = "Sapateiro"; +"type.craft.winery" = "Winery"; + "type.craft.tailor" = "Alfaiate"; "type.cuisine.african" = "Cozinha africana"; @@ -2377,6 +2393,8 @@ "type.natural.water.lake" = "Lago"; +"type.natural.water.lock" = "Câmara de Bloqueio"; + "type.natural.water.pond" = "Lagoa"; "type.natural.water.reservoir" = "Reservatório"; @@ -2955,8 +2973,6 @@ "type.waterway.drain.tunnel" = "Valeta de drenagem"; -"type.waterway.lock" = "Eclusa"; - "type.waterway.lock_gate" = "Comporta de eclusa"; "type.waterway.river" = "Rio"; diff --git a/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings index 7b09b01077..7484eeb853 100644 --- a/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings @@ -1569,16 +1569,28 @@ "type.building.warehouse" = "Warehouse"; +"type.cemetery.grave" = "Mormânt"; + "type.craft" = "Craft"; +"type.craft.beekeeper" = "beekeeper"; + +"type.craft.blacksmith" = "Blacksmith"; + "type.craft.brewery" = "Berărie"; "type.craft.carpenter" = "Tâmplar"; +"type.craft.confectionery" = "Confectionery"; + "type.craft.electrician" = "Electrician"; +"type.craft.electronics_repair" = "Electronics repair"; + "type.craft.gardener" = "Peisagist"; +"type.craft.handicraft" = "Handicraft"; + "type.craft.hvac" = "Hvac"; "type.craft.metal_construction" = "Metalurgist"; @@ -1589,8 +1601,12 @@ "type.craft.plumber" = "Instalator"; +"type.craft.sawmill" = "Sawmill"; + "type.craft.shoemaker" = "Reparații încălțăminte"; +"type.craft.winery" = "Winery"; + "type.craft.tailor" = "Croitor"; "type.cuisine.african" = "Bucătărie african"; @@ -2377,6 +2393,8 @@ "type.natural.water.lake" = "Lac"; +"type.natural.water.lock" = "Camera de blocare"; + "type.natural.water.pond" = "Heleșteu"; "type.natural.water.reservoir" = "Rezervor"; @@ -2955,8 +2973,6 @@ "type.waterway.drain.tunnel" = "Drain"; -"type.waterway.lock" = "Waterway Lock"; - "type.waterway.lock_gate" = "Ecluză"; "type.waterway.river" = "Râu"; diff --git a/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings index 940b138ee1..f138042eed 100644 --- a/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings @@ -1569,16 +1569,28 @@ "type.building.warehouse" = "Склад"; +"type.cemetery.grave" = "Могила"; + "type.craft" = "Мастерская"; +"type.craft.beekeeper" = "Пчеловод"; + +"type.craft.blacksmith" = "Кузнец"; + "type.craft.brewery" = "Крафтовое пиво"; "type.craft.carpenter" = "Столяр"; +"type.craft.confectionery" = "Кондитер"; + "type.craft.electrician" = "Электрик"; +"type.craft.electronics_repair" = "Ремонт электроники"; + "type.craft.gardener" = "Садовник"; +"type.craft.handicraft" = "Декоративный мастер"; + "type.craft.hvac" = "Кондиционеры"; "type.craft.metal_construction" = "Металлоконструкции"; @@ -1589,8 +1601,12 @@ "type.craft.plumber" = "Сантехник"; +"type.craft.sawmill" = "Лесопилка"; + "type.craft.shoemaker" = "Ремонт обуви"; +"type.craft.winery" = "Винодельня"; + "type.craft.tailor" = "Ателье"; "type.cuisine.african" = "Африканская кухня"; @@ -2377,6 +2393,8 @@ "type.natural.water.lake" = "Озеро"; +"type.natural.water.lock" = "Шлюзовая камера"; + "type.natural.water.pond" = "Пруд"; "type.natural.water.reservoir" = "Водохранилище"; @@ -2955,8 +2973,6 @@ "type.waterway.drain.tunnel" = "Водоотвод"; -"type.waterway.lock" = "Шлюз"; - "type.waterway.lock_gate" = "Шлюз"; "type.waterway.river" = "Река"; diff --git a/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings index 4e192edbde..aa790474c9 100644 --- a/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings @@ -1569,16 +1569,28 @@ "type.building.warehouse" = "Warehouse"; +"type.cemetery.grave" = "Hrob"; + "type.craft" = "Craft"; +"type.craft.beekeeper" = "beekeeper"; + +"type.craft.blacksmith" = "Blacksmith"; + "type.craft.brewery" = "Pivovar"; "type.craft.carpenter" = "Tesár"; +"type.craft.confectionery" = "Confectionery"; + "type.craft.electrician" = "Elektrikár"; +"type.craft.electronics_repair" = "Electronics repair"; + "type.craft.gardener" = "Záhradníctvo"; +"type.craft.handicraft" = "Handicraft"; + "type.craft.hvac" = "Vzduchotechnika"; "type.craft.metal_construction" = "Kovorobotník"; @@ -1589,8 +1601,12 @@ "type.craft.plumber" = "Klampiarstvo"; +"type.craft.sawmill" = "Sawmill"; + "type.craft.shoemaker" = "Oprava obuvy"; +"type.craft.winery" = "Winery"; + "type.craft.tailor" = "Krajčírstvo"; "type.cuisine.african" = "Africká kuchyňa"; @@ -2377,6 +2393,8 @@ "type.natural.water.lake" = "Jazero"; +"type.natural.water.lock" = "Uzamykacia komora"; + "type.natural.water.pond" = "Rybník"; "type.natural.water.reservoir" = "Nádrž"; @@ -2955,8 +2973,6 @@ "type.waterway.drain.tunnel" = "Drain"; -"type.waterway.lock" = "Waterway Lock"; - "type.waterway.lock_gate" = "Stavidlo"; "type.waterway.river" = "Rieka"; diff --git a/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings index 3a3fe14067..97a6a91a13 100644 --- a/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings @@ -1569,16 +1569,28 @@ "type.building.warehouse" = "Warehouse"; +"type.cemetery.grave" = "Grav"; + "type.craft" = "Craft"; +"type.craft.beekeeper" = "beekeeper"; + +"type.craft.blacksmith" = "Blacksmith"; + "type.craft.brewery" = "Bryggeri"; "type.craft.carpenter" = "Snickare"; +"type.craft.confectionery" = "Confectionery"; + "type.craft.electrician" = "Elektriker"; +"type.craft.electronics_repair" = "Electronics repair"; + "type.craft.gardener" = "Trädgårdsmästare"; +"type.craft.handicraft" = "Handicraft"; + "type.craft.hvac" = "Vvs"; "type.craft.metal_construction" = "Metallarbetare"; @@ -1589,8 +1601,12 @@ "type.craft.plumber" = "Vvs-montör"; +"type.craft.sawmill" = "Sawmill"; + "type.craft.shoemaker" = "Skomakare"; +"type.craft.winery" = "Winery"; + "type.craft.tailor" = "Skräddare"; "type.cuisine.african" = "Afrikansk mat"; @@ -2377,6 +2393,8 @@ "type.natural.water.lake" = "Sjö"; +"type.natural.water.lock" = "Låskammare"; + "type.natural.water.pond" = "Damm"; "type.natural.water.reservoir" = "Reservoar"; @@ -2955,8 +2973,6 @@ "type.waterway.drain.tunnel" = "Drain"; -"type.waterway.lock" = "Waterway Lock"; - "type.waterway.lock_gate" = "Slussport"; "type.waterway.river" = "Flod"; diff --git a/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings index 6c66e7c5c9..339245793d 100644 --- a/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings @@ -1569,16 +1569,28 @@ "type.building.warehouse" = "Warehouse"; +"type.cemetery.grave" = "Kaburi"; + "type.craft" = "Craft"; +"type.craft.beekeeper" = "beekeeper"; + +"type.craft.blacksmith" = "Blacksmith"; + "type.craft.brewery" = "Craft Brewery"; "type.craft.carpenter" = "Carpenter"; +"type.craft.confectionery" = "Confectionery"; + "type.craft.electrician" = "Electrician"; +"type.craft.electronics_repair" = "Electronics repair"; + "type.craft.gardener" = "Gardener"; +"type.craft.handicraft" = "Handicraft"; + "type.craft.hvac" = "Hvac"; "type.craft.metal_construction" = "Metal Worker"; @@ -1589,8 +1601,12 @@ "type.craft.plumber" = "Plumber"; +"type.craft.sawmill" = "Sawmill"; + "type.craft.shoemaker" = "Shoe Repair"; +"type.craft.winery" = "Winery"; + "type.craft.tailor" = "Tailor"; "type.cuisine.african" = "African"; @@ -2377,6 +2393,8 @@ "type.natural.water.lake" = "Lake"; +"type.natural.water.lock" = "Chumba cha kufuli"; + "type.natural.water.pond" = "Pond"; "type.natural.water.reservoir" = "Hifadhi"; @@ -2955,8 +2973,6 @@ "type.waterway.drain.tunnel" = "Drain"; -"type.waterway.lock" = "Waterway Lock"; - "type.waterway.lock_gate" = "Lock Gate"; "type.waterway.river" = "River"; diff --git a/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings index af2c584f14..47022e80b0 100644 --- a/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings @@ -1569,16 +1569,28 @@ "type.building.warehouse" = "Warehouse"; +"type.cemetery.grave" = "หลุมฝังศพ"; + "type.craft" = "Craft"; +"type.craft.beekeeper" = "beekeeper"; + +"type.craft.blacksmith" = "Blacksmith"; + "type.craft.brewery" = "โรงเบียร์"; "type.craft.carpenter" = "ช่างไม้"; +"type.craft.confectionery" = "Confectionery"; + "type.craft.electrician" = "ช่างไฟฟ้า"; +"type.craft.electronics_repair" = "Electronics repair"; + "type.craft.gardener" = "คนจัดสวน"; +"type.craft.handicraft" = "Handicraft"; + "type.craft.hvac" = "ระบบปรับอากาศ"; "type.craft.metal_construction" = "ช่างเหล็ก"; @@ -1589,8 +1601,12 @@ "type.craft.plumber" = "ช่างประปา"; +"type.craft.sawmill" = "Sawmill"; + "type.craft.shoemaker" = "ช่างซ่อมรองเท้า"; +"type.craft.winery" = "Winery"; + "type.craft.tailor" = "ช่างตัดเสื้อ"; "type.cuisine.african" = "อาหารแอฟริกัน"; @@ -2377,6 +2393,8 @@ "type.natural.water.lake" = "ทะเลสาบ"; +"type.natural.water.lock" = "ห้องล็อค"; + "type.natural.water.pond" = "บ่อ"; "type.natural.water.reservoir" = "อ่างเก็บน้ำ"; @@ -2955,8 +2973,6 @@ "type.waterway.drain.tunnel" = "Drain"; -"type.waterway.lock" = "Waterway Lock"; - "type.waterway.lock_gate" = "ประตูระบายน้ำ"; "type.waterway.river" = "แม่น้ำ"; diff --git a/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings index 39092677bb..6d9c857825 100644 --- a/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings @@ -1569,16 +1569,28 @@ "type.building.warehouse" = "Depo"; +"type.cemetery.grave" = "Mezar"; + "type.craft" = "Zanaat"; +"type.craft.beekeeper" = "beekeeper"; + +"type.craft.blacksmith" = "Blacksmith"; + "type.craft.brewery" = "Bira Fabrikası"; "type.craft.carpenter" = "Marangoz"; +"type.craft.confectionery" = "Confectionery"; + "type.craft.electrician" = "Elektrikçi"; +"type.craft.electronics_repair" = "Electronics repair"; + "type.craft.gardener" = "Bahçe Düzenleyici"; +"type.craft.handicraft" = "Handicraft"; + "type.craft.hvac" = "Klimacı"; "type.craft.metal_construction" = "Dökümcü"; @@ -1589,8 +1601,12 @@ "type.craft.plumber" = "Tesisatçı"; +"type.craft.sawmill" = "Sawmill"; + "type.craft.shoemaker" = "Ayakkabı Tamircisi"; +"type.craft.winery" = "Winery"; + "type.craft.tailor" = "Terzi"; "type.cuisine.african" = "Afrika mutfağı"; @@ -2377,6 +2393,8 @@ "type.natural.water.lake" = "Göl"; +"type.natural.water.lock" = "Kilit Odası"; + "type.natural.water.pond" = "Gölet"; "type.natural.water.reservoir" = "Rezervuar"; @@ -2955,8 +2973,6 @@ "type.waterway.drain.tunnel" = "Lağım"; -"type.waterway.lock" = "Kanal Havuzu"; - "type.waterway.lock_gate" = "Kilit Kapısı"; "type.waterway.river" = "Nehir"; diff --git a/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings index 438848570e..f08f5f2c76 100644 --- a/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings @@ -1569,16 +1569,28 @@ "type.building.warehouse" = "Склад"; +"type.cemetery.grave" = "Могила"; + "type.craft" = "Майстерня"; +"type.craft.beekeeper" = "beekeeper"; + +"type.craft.blacksmith" = "Blacksmith"; + "type.craft.brewery" = "Пивоварня"; "type.craft.carpenter" = "Столяр"; +"type.craft.confectionery" = "Confectionery"; + "type.craft.electrician" = "Електрик"; +"type.craft.electronics_repair" = "Electronics repair"; + "type.craft.gardener" = "Садівник"; +"type.craft.handicraft" = "Handicraft"; + "type.craft.hvac" = "Кондиціонери"; "type.craft.metal_construction" = "Металоконструкції"; @@ -1589,8 +1601,12 @@ "type.craft.plumber" = "Сантехнік"; +"type.craft.sawmill" = "Sawmill"; + "type.craft.shoemaker" = "Ремонт взуття"; +"type.craft.winery" = "Winery"; + "type.craft.tailor" = "Ательє"; "type.cuisine.african" = "Африканська кухня"; @@ -2377,6 +2393,8 @@ "type.natural.water.lake" = "Озеро"; +"type.natural.water.lock" = "Замкова камера"; + "type.natural.water.pond" = "Ставок"; "type.natural.water.reservoir" = "Водосховище"; @@ -2955,8 +2973,6 @@ "type.waterway.drain.tunnel" = "Водовiдвiд"; -"type.waterway.lock" = "Шлюз"; - "type.waterway.lock_gate" = "Шлюз"; "type.waterway.river" = "Річка"; diff --git a/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings index 9717dc0255..28e1404c77 100644 --- a/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings @@ -1569,16 +1569,28 @@ "type.building.warehouse" = "Warehouse"; +"type.cemetery.grave" = "Phần mộ"; + "type.craft" = "Craft"; +"type.craft.beekeeper" = "beekeeper"; + +"type.craft.blacksmith" = "Blacksmith"; + "type.craft.brewery" = "Nhà máy bia"; "type.craft.carpenter" = "Thợ mộc"; +"type.craft.confectionery" = "Confectionery"; + "type.craft.electrician" = "Thợ điện"; +"type.craft.electronics_repair" = "Electronics repair"; + "type.craft.gardener" = "Người thiết kế và xây dựng cảnh quan"; +"type.craft.handicraft" = "Handicraft"; + "type.craft.hvac" = "Điều hòa nhiệt độ"; "type.craft.metal_construction" = "Nhà kim khí"; @@ -1589,8 +1601,12 @@ "type.craft.plumber" = "Thợ đường ống"; +"type.craft.sawmill" = "Sawmill"; + "type.craft.shoemaker" = "Sửa giày"; +"type.craft.winery" = "Winery"; + "type.craft.tailor" = "Thợ may"; "type.cuisine.african" = "Ẩm thực châu phi"; @@ -2377,6 +2393,8 @@ "type.natural.water.lake" = "Hồ"; +"type.natural.water.lock" = "Khoang khóa"; + "type.natural.water.pond" = "Ao"; "type.natural.water.reservoir" = "Hồ chứa"; @@ -2955,8 +2973,6 @@ "type.waterway.drain.tunnel" = "Drain"; -"type.waterway.lock" = "Waterway Lock"; - "type.waterway.lock_gate" = "Cổng Khóa"; "type.waterway.river" = "Sông"; diff --git a/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings index ab5afb876b..4e12a1d461 100644 --- a/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings @@ -1569,16 +1569,28 @@ "type.building.warehouse" = "仓库"; +"type.cemetery.grave" = "墓穴"; + "type.craft" = "工艺作坊"; +"type.craft.beekeeper" = "beekeeper"; + +"type.craft.blacksmith" = "Blacksmith"; + "type.craft.brewery" = "酿酒厂"; "type.craft.carpenter" = "木匠"; +"type.craft.confectionery" = "Confectionery"; + "type.craft.electrician" = "电工"; +"type.craft.electronics_repair" = "Electronics repair"; + "type.craft.gardener" = "园艺工"; +"type.craft.handicraft" = "Handicraft"; + "type.craft.hvac" = "暖通工程师"; "type.craft.metal_construction" = "金属制造工"; @@ -1589,8 +1601,12 @@ "type.craft.plumber" = "管道工"; +"type.craft.sawmill" = "Sawmill"; + "type.craft.shoemaker" = "鞋匠"; +"type.craft.winery" = "Winery"; + "type.craft.tailor" = "裁缝"; "type.cuisine.african" = "非洲菜"; @@ -2377,6 +2393,8 @@ "type.natural.water.lake" = "湖"; +"type.natural.water.lock" = "锁室"; + "type.natural.water.pond" = "池塘"; "type.natural.water.reservoir" = "水库"; @@ -2955,8 +2973,6 @@ "type.waterway.drain.tunnel" = "渠"; -"type.waterway.lock" = "Waterway Lock"; - "type.waterway.lock_gate" = "闸门"; "type.waterway.river" = "河流"; diff --git a/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings index dc332c614e..2463152f1e 100644 --- a/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings @@ -1569,16 +1569,28 @@ "type.building.warehouse" = "Warehouse"; +"type.cemetery.grave" = "墓穴"; + "type.craft" = "Craft"; +"type.craft.beekeeper" = "beekeeper"; + +"type.craft.blacksmith" = "Blacksmith"; + "type.craft.brewery" = "釀酒廠"; "type.craft.carpenter" = "木工"; +"type.craft.confectionery" = "Confectionery"; + "type.craft.electrician" = "電工"; +"type.craft.electronics_repair" = "Electronics repair"; + "type.craft.gardener" = "園藝師"; +"type.craft.handicraft" = "Handicraft"; + "type.craft.hvac" = "空調設備"; "type.craft.metal_construction" = "鐵工"; @@ -1589,8 +1601,12 @@ "type.craft.plumber" = "水管工人"; +"type.craft.sawmill" = "Sawmill"; + "type.craft.shoemaker" = "修鞋工"; +"type.craft.winery" = "Winery"; + "type.craft.tailor" = "裁縫師"; "type.cuisine.african" = "非洲料理"; @@ -2377,6 +2393,8 @@ "type.natural.water.lake" = "湖泊"; +"type.natural.water.lock" = "鎖室"; + "type.natural.water.pond" = "潭"; "type.natural.water.reservoir" = "水庫"; @@ -2955,8 +2973,6 @@ "type.waterway.drain.tunnel" = "Drain"; -"type.waterway.lock" = "Waterway Lock"; - "type.waterway.lock_gate" = "閘門"; "type.waterway.river" = "河流"; -- 2.45.3