organicmaps/organicmaps-tmp

Archived

[classifier][styles] Added grave, cliff, earth_bank. #2688

Merged

vng merged 8 commits from vng-fix into master

2022-06-11 06:53:22 +00:00

vng commented

2022-06-07 16:14:17 +00:00

(Migrated from github.com)

organicmaps/organicmaps#2655

https://git.omaps.dev/organicmaps/organicmaps/issues/2655

pastk requested changes 2022-06-08 15:09:51 +00:00

pastk left a comment

Owner

New type like cliff, earth bank, etc. do not need translations in types_strings.txt?

Please add some screenshots with cliffs and updated walls/fences styles.

New type like cliff, earth bank, etc. do not need translations in types_strings.txt? Please add some screenshots with cliffs and updated walls/fences styles.

data/styles/clear/include/Icons.mapcss

pastk commented

2022-06-08 15:04:41 +00:00

Owner

I think its better to find a new icon for graves

I think its better to find a new icon for graves

data/styles/vehicle/include/Icons.mapcss

					
				@ -482,7 +482,7 @@ area|z15[historic=memorial]

				node|z16-[historic=monument],

				area|z16-[historic=monument],

pastk commented

2022-06-08 15:07:15 +00:00

Owner

I suggest not to add it to the vehicle style as its overloaded with details already.
Let's start to treat it as a separate style we're developing for motorists with a focus on roads / vehicle amenities and reduced distraction from generic POIs.

I suggest not to add it to the vehicle style as its overloaded with details already. Let's start to treat it as a separate style we're developing for motorists with a focus on roads / vehicle amenities and reduced distraction from generic POIs.

vng commented

2022-06-08 19:54:32 +00:00

(Migrated from github.com)

For cliff, earth_bank I added temporary line style and todo. Should patch core drape engine to be able to draw line with triangles like here: https://wiki.openstreetmap.org/wiki/File:Natural_cliff-125.png

For cliff, earth_bank I added temporary line style and todo. Should patch core drape engine to be able to draw line with triangles like here: https://wiki.openstreetmap.org/wiki/File:Natural_cliff-125.png

vng (Migrated from github.com) reviewed 2022-06-09 06:16:08 +00:00

data/styles/clear/include/Icons.mapcss

vng (Migrated from github.com) commented

2022-06-09 06:16:08 +00:00

Ops, better to move it together with existing landuse=cemetery, not monument.

Ops, better to move it together with existing landuse=cemetery, not monument.

vng (Migrated from github.com) reviewed 2022-06-09 06:16:22 +00:00

data/styles/vehicle/include/Icons.mapcss

					
				@ -482,7 +482,7 @@ area|z15[historic=memorial]

				node|z16-[historic=monument],

				area|z16-[historic=monument],

vng (Migrated from github.com) commented

2022-06-09 06:16:22 +00:00

Ok

Ok

biodranik (Migrated from github.com) approved these changes 2022-06-09 09:48:19 +00:00

data/strings/types_strings.txt

					
				@ -4765,0 +4788,4 @@

				    pt = Túmulo

				    pt-BR = Túmulo

				    ro = Mormânt

				    ru = Могила

biodranik (Migrated from github.com) commented

2022-06-09 09:42:36 +00:00

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 = 墓穴

``` 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 = 墓穴 ```

biodranik (Migrated from github.com) commented

2022-06-09 09:42:54 +00:00

DELIM=' = ' tools/unix/translate_categories.sh Grave

`DELIM=' = ' tools/unix/translate_categories.sh Grave`

biodranik (Migrated from github.com) commented

2022-06-09 09:46:30 +00:00

И потом обязательно перепроверить через DeepL, особенно португальский и бразильский, гугл и скрипт их не умеет.

И потом обязательно перепроверить через DeepL, особенно португальский и бразильский, гугл и скрипт их не умеет.

data/strings/types_strings.txt

biodranik (Migrated from github.com) commented

2022-06-09 09:46:49 +00:00

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 = 鎖室

``` 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 = 鎖室 ```

data/styles/clear/include/Basemap.mapcss

biodranik (Migrated from github.com) commented

2022-06-09 09:47:30 +00:00

Может можно как-то простым if сейчас хакнуть в drape и добавить хоть минимальные штрихи?

Может можно как-то простым if сейчас хакнуть в drape и добавить хоть минимальные штрихи?

generator/generator_tests/osm_type_test.cpp

biodranik (Migrated from github.com) commented

2022-06-09 09:48:16 +00:00

Эти обрывы важны для автомобилистов?

Эти обрывы важны для автомобилистов?

vng (Migrated from github.com) reviewed 2022-06-09 10:33:01 +00:00

data/styles/clear/include/Basemap.mapcss

vng (Migrated from github.com) commented

2022-06-09 10:33:01 +00:00

Добавить минимальные штрихи в drape - такая же непростая задача.

Добавить минимальные штрихи в drape - такая же непростая задача.

vng (Migrated from github.com) reviewed 2022-06-09 10:34:44 +00:00

generator/generator_tests/osm_type_test.cpp

vng (Migrated from github.com) commented

2022-06-09 10:34:44 +00:00

Если едешь в поисках места где остановится погулять - скорее да. Чисто автомобилистам важны только дороги.

Если едешь в поисках места где остановится погулять - скорее да. Чисто автомобилистам важны только дороги.

pastk commented

2022-06-09 11:22:32 +00:00

Owner

New types like cliff, earth bank, etc. do not need translations in types_strings.txt?

New types like cliff, earth bank, etc. do not need translations in types_strings.txt?

vng commented

2022-06-09 15:23:58 +00:00

(Migrated from github.com)

@biodranik @pastk Если есть возможность, помогите отдельным комитом с переводами новых типов. Я тут их добавил чтобы запустить генератор, а сейчас застрял в алгоритмах. Хитро чудит поиск просто при добавлении категорий.

@biodranik @pastk Если есть возможность, помогите отдельным комитом с переводами новых типов. Я тут их добавил чтобы запустить генератор, а сейчас застрял в алгоритмах. Хитро чудит поиск просто при добавлении категорий.

vng commented

2022-06-10 07:23:40 +00:00

(Migrated from github.com)

PTAL

@pastk In general all types should have translations, but no problem if not :)
Can be added later.

PTAL @pastk In general all types should have translations, but no problem if not :) Can be added later.

pastk approved these changes 2022-06-10 09:06:17 +00:00

data/categories.txt

pastk commented

2022-06-10 09:00:42 +00:00

Owner

] typo

`]` typo

data/categories.txt

pastk commented

2022-06-10 09:01:15 +00:00

Owner

please add craft-sawmill

please add `craft-sawmill`

data/drules_proto_clear.txt

					
				@ -11579,0 +11785,4 @@

				  element {

				    scale: 19

				    symbol {

				      name: "hand-m"

pastk commented

2022-06-10 09:06:10 +00:00

Owner

IMO our craft "hand palm" icon is terrible - looks like a stop sign to me...

IMO our `craft` "hand palm" icon is terrible - looks like a stop sign to me...

pastk commented

2022-06-10 09:07:10 +00:00

Owner

@pastk In general all types should have translations, but no problem if not :) Can be added later.

Sorry I don't have enough time to help with translations now..

> @pastk In general all types should have translations, but no problem if not :) Can be added later. Sorry I don't have enough time to help with translations now..

vng (Migrated from github.com) reviewed 2022-06-10 09:28:10 +00:00

data/categories.txt

vng (Migrated from github.com) commented

2022-06-10 09:28:10 +00:00

Думаешь, стоит иметь "Пилорама" в категориях? :)

Думаешь, стоит иметь "Пилорама" в категориях? :)

pastk commented

2022-06-10 10:00:48 +00:00

Owner

Please add some screenshots with cliffs and updated walls/fences styles.

It would be good to see the change of the fence style. ATM its a dotted thin line. It looks like you made it more like dashed line. I'm worried if it will become more like paths/tracks?

> Please add some screenshots with cliffs and updated walls/fences styles. It would be good to see the change of the fence style. ATM its a dotted thin line. It looks like you made it more like dashed line. I'm worried if it will become more like paths/tracks?

pastk reviewed 2022-06-10 10:06:34 +00:00

data/categories.txt

pastk commented

2022-06-10 10:06:33 +00:00

Owner

почему нет? люди могут искать лесопилку
кстати, хорошо было бы их смёржить с https://wiki.openstreetmap.org/wiki/Tag:industrial%3Dsawmill
по логике лучше вмёржить craft=sawmill в industrial=sawmill (хотя последний пока меньше используется)

почему нет? люди могут искать лесопилку кстати, хорошо было бы их смёржить с https://wiki.openstreetmap.org/wiki/Tag:industrial%3Dsawmill по логике лучше вмёржить craft=sawmill в industrial=sawmill (хотя последний пока меньше используется)

vng commented

2022-06-10 10:08:00 +00:00

(Migrated from github.com)

Fence become a little bit better (more contrast). I fixed this style because dashdot: 1, 1 is a minimum in styles generator
So (0.12, 0.12) and (0.25, 0.25) was always transformed into (1, 1) with no difference.

New styles screenshot:
Screenshot 2022-06-10 at 13 04 48

Fence become a little bit better (more contrast). I fixed this style because dashdot: 1, 1 is a _minimum_ in styles generator So (0.12, 0.12) and (0.25, 0.25) was always transformed into (1, 1) with no difference. New styles screenshot: <img width="1306" alt="Screenshot 2022-06-10 at 13 04 48" src="https://user-images.githubusercontent.com/175612/173043028-33be2fed-2b3a-424f-9830-236375b16ecc.png">

pastk reviewed 2022-06-10 10:14:17 +00:00

data/drules_proto_clear.txt

					
				@ -11579,0 +11785,4 @@

				  element {

				    scale: 19

				    symbol {

				      name: "hand-m"

pastk commented

2022-06-10 10:14:17 +00:00

Owner

maybe this will be better?
https://materialdesignicons.com/icon/storefront-outline

maybe this will be better? https://materialdesignicons.com/icon/storefront-outline

This repo is archived. You cannot comment on pull requests.

No reviewers

No labels

Android Automotive (AAOS)

Android Automotive (AAOS)

Battery and Performance

Battery and Performance

Bookmarks and Tracks

Bookmarks and Tracks

External Map Datasets

External Map Datasets

Frequently User Reported

Frequently User Reported

Good first issue

Good first issue

Linux packaging

Linux packaging

NLnet 2024-06-281

NLnet 2024-06-281

No Feature Parity

No Feature Parity

Public Transport

Public Transport

Track Recording

Track Recording

Walk Navigation

Walk Navigation

No milestone

No project

No assignees

2 participants

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: organicmaps/organicmaps-tmp#2688

No description provided.