organicmaps/organicmaps-tmp

Archived

Fork 1

Added preset for boundary=marker #8113

Open

kubahaha wants to merge 7 commits from kubahaha/boundary_marker-preset into master

kubahaha commented

2024-05-06 23:42:06 +00:00

(Migrated from github.com)

Hello
I tried to add preset for boundary=marker. Can someone take a look please?

Following instructions from docs/STYLES.ms I was unable to run tools/unix/generate_symbols.sh and next scripts due to following CMake errors:

CMake Error at 3party/CMakeLists.txt:24 (add_subdirectory):

  add_subdirectory given source "expat/expat" which is not an existing
  directory.


CMake Error at 3party/CMakeLists.txt:25 (add_library):
  add_library cannot create ALIAS target "expat::expat" because target
  "expat" does not already exist.


CMake Error at 3party/CMakeLists.txt:33 (add_subdirectory):
  The source directory

    /home/user/repos/organicmaps/3party/jansson/jansson

  does not contain a CMakeLists.txt file.


CMake Error at 3party/CMakeLists.txt:34 (target_include_directories):
  Cannot specify include directories for target "jansson" which is not built
  by this project.


CMake Error at 3party/CMakeLists.txt:35 (add_library):
  add_library cannot create ALIAS target "jansson::jansson" because target
  "jansson" does not already exist.


CMake Error at 3party/CMakeLists.txt:38 (add_subdirectory):
  The source directory

    /home/user/repos/organicmaps/3party/gflags

  does not contain a CMakeLists.txt file.


CMake Error at 3party/CMakeLists.txt:39 (target_compile_options):
  Cannot specify compile options for target "gflags_nothreads_static" which
  is not built by this project.

can someone help me fix that dependencies, or by any chance would like to run it on already configured environment?

Hello I tried to add preset for [boundary=marker](https://wiki.openstreetmap.org/wiki/Tag:boundary=marker). Can someone take a look please? Following instructions from [docs/STYLES.ms](https://github.com/organicmaps/organicmaps/blob/master/docs/STYLES.md) I was unable to run `tools/unix/generate_symbols.sh` and next scripts due to following CMake errors: ``` CMake Error at 3party/CMakeLists.txt:24 (add_subdirectory): add_subdirectory given source "expat/expat" which is not an existing directory. CMake Error at 3party/CMakeLists.txt:25 (add_library): add_library cannot create ALIAS target "expat::expat" because target "expat" does not already exist. CMake Error at 3party/CMakeLists.txt:33 (add_subdirectory): The source directory /home/user/repos/organicmaps/3party/jansson/jansson does not contain a CMakeLists.txt file. CMake Error at 3party/CMakeLists.txt:34 (target_include_directories): Cannot specify include directories for target "jansson" which is not built by this project. CMake Error at 3party/CMakeLists.txt:35 (add_library): add_library cannot create ALIAS target "jansson::jansson" because target "jansson" does not already exist. CMake Error at 3party/CMakeLists.txt:38 (add_subdirectory): The source directory /home/user/repos/organicmaps/3party/gflags does not contain a CMakeLists.txt file. CMake Error at 3party/CMakeLists.txt:39 (target_compile_options): Cannot specify compile options for target "gflags_nothreads_static" which is not built by this project. ``` can someone help me fix that dependencies, or by any chance would like to run it on already configured environment?

pastk requested changes 2024-05-07 09:58:12 +00:00

pastk left a comment

Member

Thanks for the PR!
Some changes are needed

Thanks for the PR! Some changes are needed

data/editor.config

pastk commented

2024-05-07 09:37:01 +00:00

Member

unfortunately "ref" is not supported by the editor yet

data/styles/clear/include/Icons.mapcss

pastk commented

2024-05-07 09:44:31 +00:00

Member

Its a quite minor micro-mapped feature, so I think it should be visible starting at z18- or z19- even.

(historic=boundary_stone is visible earlier because its historic and hence is kinda touristic attraction)

Its a quite minor micro-mapped feature, so I think it should be visible starting at z18- or z19- even. (`historic=boundary_stone` is visible earlier because its historic and hence is kinda touristic attraction)

data/styles/clear/include/Icons.mapcss

pastk commented

2024-05-07 09:50:06 +00:00

Member

mmm I don't think the monument icon is a good fit for boundary markers...
it'd be best to add a new icon e.g. based on bcontrol-m

for now it should be alright to use a dot-m.svg icon I think

mmm I don't think the monument icon is a good fit for boundary markers... it'd be best to add a new icon e.g. based on `bcontrol-m` for now it should be alright to use a `dot-m.svg` icon I think

data/styles/clear/include/priorities_4_overlays.prio.txt

pastk commented

2024-05-07 09:52:34 +00:00

Member

its priority should be lower too, I suggest 220

data/styles/outdoors/include/priorities_4_overlays.prio.txt

pastk commented

2024-05-07 09:56:40 +00:00

Member

for the outdoors style it makes sense indeed to show them from z16-, for that you'll have to edit outdoors Icons.mapcss

data/styles/vehicle/include/Icons.mapcss

pastk commented

2024-05-07 09:54:07 +00:00

Member

for the vehicle (navigation) style I think its not needed at all, it'll be a distraction for drivers

kubahaha (Migrated from github.com) reviewed 2024-05-07 20:10:48 +00:00

data/editor.config

kubahaha (Migrated from github.com) commented

2024-05-07 20:10:48 +00:00

Thanks, fixed

kubahaha (Migrated from github.com) reviewed 2024-05-07 20:14:51 +00:00

data/styles/clear/include/Icons.mapcss

kubahaha (Migrated from github.com) commented

2024-05-07 20:14:51 +00:00

I moved it to dot-m.svg as you suggested.
I'm not sure about where to put it in file (to comply with ToC), so I chose 5.5 Amenity -> Others

I moved it to `dot-m.svg` as you suggested. I'm not sure about where to put it in file (to comply with ToC), so I chose 5.5 Amenity -> Others

kubahaha (Migrated from github.com) reviewed 2024-05-07 20:15:33 +00:00

data/styles/clear/include/Icons.mapcss

kubahaha (Migrated from github.com) commented

2024-05-07 20:15:33 +00:00

Let's try with z18 :-)

kubahaha (Migrated from github.com) reviewed 2024-05-07 20:17:13 +00:00

data/styles/clear/include/priorities_4_overlays.prio.txt

kubahaha (Migrated from github.com) commented

2024-05-07 20:17:13 +00:00

Moved to 220

kubahaha (Migrated from github.com) reviewed 2024-05-07 20:17:39 +00:00

data/styles/vehicle/include/Icons.mapcss

kubahaha (Migrated from github.com) commented

2024-05-07 20:17:39 +00:00

I agree, removed

kubahaha (Migrated from github.com) reviewed 2024-05-07 20:20:28 +00:00

data/styles/outdoors/include/priorities_4_overlays.prio.txt

kubahaha (Migrated from github.com) commented

2024-05-07 20:20:28 +00:00

Ok, I hope I did it correctly

pastk reviewed 2024-05-07 20:57:55 +00:00

data/categories.txt

pastk commented

2024-05-07 20:57:55 +00:00

Member

this actually enables searching for boundary markers

but do we really need it?

this actually enables searching for boundary markers but do we really need it?

patepelo reviewed 2024-05-08 08:19:19 +00:00

data/categories.txt

patepelo commented

2024-05-08 08:19:19 +00:00

Member

IMO we should minimize adding this kind of elements to avoid slowing down the search.

kubahaha (Migrated from github.com) reviewed 2024-05-09 21:05:44 +00:00

data/categories.txt

kubahaha (Migrated from github.com) commented

2024-05-09 21:05:44 +00:00

I aggree, removed that change

pastk reviewed 2024-05-09 21:19:47 +00:00

data/styles/outdoors/include/priorities_4_overlays.prio.txt

pastk commented

2024-05-09 21:18:39 +00:00

Member

here it should be moved to priority 220 also

data/styles/vehicle/include/priorities_4_overlays.prio.txt

pastk commented

2024-05-09 21:19:05 +00:00

Member

it should be removed from the vehicle style

kubahaha (Migrated from github.com) reviewed 2024-05-09 21:26:02 +00:00

data/styles/outdoors/include/priorities_4_overlays.prio.txt

kubahaha (Migrated from github.com) commented

2024-05-09 21:26:02 +00:00

Done

kubahaha (Migrated from github.com) reviewed 2024-05-09 21:27:29 +00:00

data/styles/vehicle/include/priorities_4_overlays.prio.txt

kubahaha (Migrated from github.com) commented

2024-05-09 21:27:29 +00:00

Done, thanks

matheusgomesms (Migrated from github.com) reviewed 2024-05-09 22:13:32 +00:00

data/strings/types_strings.txt

matheusgomesms (Migrated from github.com) commented

2024-05-09 22:13:32 +00:00

    pt = Marco de fronteira

PT = PT-BR = Marco de fronteira (since it's equal, no need to have PT-BR duplicated)

```suggestion pt = Marco de fronteira ``` PT = PT-BR = Marco de fronteira (since it's equal, no need to have PT-BR duplicated)

j13m126 (Migrated from github.com) approved these changes 2024-05-10 04:53:53 +00:00

vgrigoriu (Migrated from github.com) reviewed 2024-05-10 06:16:38 +00:00

data/strings/types_strings.txt

vgrigoriu (Migrated from github.com) commented

2024-05-10 06:16:38 +00:00

    ro = Piatră de hotar

```suggestion ro = Piatră de hotar ```

Vuizur (Migrated from github.com) reviewed 2024-05-21 21:36:05 +00:00

data/strings/types_strings.txt

Vuizur (Migrated from github.com) commented

2024-05-21 21:35:16 +00:00

It should de = Grenzstein.
I think that some number of other translations are also not correct (for example probably Czech), maybe one could take the translations from Wikipedia: https://en.wikipedia.org/wiki/Boundary_marker

It should de = Grenzstein. I think that some number of other translations are also not correct (for example probably Czech), maybe one could take the translations from Wikipedia: https://en.wikipedia.org/wiki/Boundary_marker